Use NxWidgets::CScaledBitmap to scale icons in the NxWM taskbar

2013-10-15 14:29:06 -06:00 · 2013-10-15 14:29:06 -06:00 · 00459197d2
commit 00459197d2
parent 8ebfad6bc9
2 changed files with 139 additions and 26 deletions
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@ -889,6 +889,9 @@ CONFIG_NXWM_TASKBAR_HSPACING=8
 CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_RIGHT is not set
 # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+CONFIG_NXWM_TASKBAR_ICONSCALE=y
+CONFIG_NXWM_TASKBAR_ICONWIDTH=50
+CONFIG_NXWM_TASKBAR_ICONHEIGHT=42
 # CONFIG_NXWM_DISABLE_MINIMIZE is not set
 # CONFIG_NXWM_TASKBAR_NO_BORDER is not set

--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-# CONFIG_APPS_DIR="../apps"
+CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set

 #
@ -39,6 +39,7 @@ CONFIG_HOST_LINUX=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y

 #
@ -56,7 +57,6 @@ CONFIG_ARCH_SIM=y
 # CONFIG_ARCH_Z16 is not set
 # CONFIG_ARCH_Z80 is not set
 CONFIG_ARCH="sim"
-CONFIG_BOARD_LOOPSPERMSEC=

 #
 # Simulation Configuration Options
@ -74,18 +74,22 @@ CONFIG_SIM_FBBPP=32
 # Architecture Options
 #
 # CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
+# CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_STACKDUMP is not set
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+# CONFIG_ARCH_HAVE_RAMVECTORS is not set

 #
 # Board Settings
 #
-CONFIG_RAM_START=
-CONFIG_RAM_SIZE=
+CONFIG_BOARD_LOOPSPERMSEC=5000
+# CONFIG_ARCH_CALIBRATION is not set

 #
 # Boot options
@ -96,6 +100,12 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_RUNFROMSDRAM is not set
 # CONFIG_BOOT_COPYTORAM is not set

+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x0
+CONFIG_RAM_SIZE=0
+
 #
 # Board Selection
 #
@ -115,10 +125,12 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
+# CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=32
+# CONFIG_SCHED_HAVE_PARENT is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2012
 CONFIG_START_MONTH=5
@ -129,8 +141,8 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WORKQUEUE is not set
 CONFIG_SCHED_WAITPID=y
+# CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
@ -141,9 +153,16 @@ CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
 # CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_DISABLE_ENVIRON is not set
-CONFIG_DISABLE_POLL=y
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+CONFIG_SIG_SIGWORK=17

 #
 # Sizes of configurable things (0 disables)
@ -171,6 +190,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=8192
 #
 # Device Drivers
 #
+CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_LOOP is not set
@ -182,6 +202,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
@ -191,11 +212,16 @@ CONFIG_DEV_NULL=y
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
 # CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
+
+#
+# USART Configuration
+#
 # CONFIG_STANDARD_SERIAL is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@ -221,19 +247,22 @@ CONFIG_SERIAL=y
 #
 # File system configuration
 #
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
 # CONFIG_FAT_DMAMEMORY is not set
-# CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_SMARTFS is not set

 #
 # System Logging
 #
+# CONFIG_SYSLOG_ENABLE is not set
 # CONFIG_SYSLOG is not set

 #
@ -265,15 +294,14 @@ CONFIG_NX_KBD=y
 # Framed Window Borders
 #
 CONFIG_NXTK_BORDERWIDTH=4
-CONFIG_NXTK_BORDERCOLOR1=0x005a96bd
-CONFIG_NXTK_BORDERCOLOR2=0x00233a49
-CONFIG_NXTK_BORDERCOLOR3=0x00f8f8f8
+CONFIG_NXTK_DEFAULT_BORDERCOLORS=y
 # CONFIG_NXTK_AUTORAISE is not set

 #
 # Font Selections
 #
 CONFIG_NXFONTS_CHARBITS=7
+# CONFIG_NXFONT_MONO5X8 is not set
 # CONFIG_NXFONT_SANS17X22 is not set
 # CONFIG_NXFONT_SANS20X26 is not set
 CONFIG_NXFONT_SANS23X27=y
@ -321,10 +349,16 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Memory Management
 #
+# CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set

+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
 #
 # Binary Formats
 #
@ -332,12 +366,17 @@ CONFIG_MM_REGIONS=1
 # CONFIG_BINFMT_EXEPATH is not set
 # CONFIG_NXFLAT is not set
 # CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
 # CONFIG_PIC is not set
 # CONFIG_SYMTAB_ORDEREDBYNAME is not set

 #
 # Library Routines
 #
+
+#
+# Standard C Library Options
+#
 CONFIG_STDIO_BUFFER_SIZE=64
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
@ -345,10 +384,14 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
 CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
@ -356,6 +399,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set

+#
+# Non-standard Library Support
+#
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WORKPRIORITY=192
+CONFIG_SCHED_WORKPERIOD=50000
+CONFIG_SCHED_WORKSTACKSIZE=2048
+# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
 #
 # Basic CXX Support
 #
@ -374,17 +429,14 @@ CONFIG_HAVE_CXX=y
 #

 #
-# Named Applications
+# Built-In Applications
 #
-# CONFIG_BUILTIN is not set

 #
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_CDCACM is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@ -398,9 +450,9 @@ CONFIG_HAVE_CXX=y
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_NETTEST is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
@ -415,11 +467,15 @@ CONFIG_HAVE_CXX=y
 # CONFIG_EXAMPLES_PASHELLO is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
@ -427,14 +483,13 @@ CONFIG_HAVE_CXX=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
-# CONFIG_EXAMPLES_WLAN is not set

 #
-# Interpreters
+# Graphics Support
 #
+# CONFIG_TIFF is not set

 #
 # Interpreters
@ -464,11 +519,7 @@ CONFIG_HAVE_CXX=y
 # CONFIG_NETUTILS_WEBCLIENT is not set

 #
-# ModBus
-#
-
-#
-# FreeModbus
+# FreeModBus
 #
 # CONFIG_MODBUS is not set

@ -480,10 +531,13 @@ CONFIG_NSH_LIBRARY=y
 #
 # Disable Individual commands
 #
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
 # CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@ -519,22 +573,34 @@ CONFIG_NSH_LIBRARY=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
+CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_ROMFSETC=y
+# CONFIG_NSH_ROMFSRC is not set
 CONFIG_NSH_ROMFSMOUNTPT="/etc"
 CONFIG_NSH_INITSCRIPT="init.d/rcS"
 CONFIG_NSH_ROMFSDEVNO=1
 CONFIG_NSH_ROMFSSECTSIZE=64
+# CONFIG_NSH_ARCHROMFS is not set
 CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FATSECTSIZE=512
 CONFIG_NSH_FATNSECTORS=1024
 CONFIG_NSH_FATMOUNTPT="/tmp"
 CONFIG_NSH_CONSOLE=y
+
+#
+# USB Trace Support
+#
 # CONFIG_NSH_CONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set

@ -608,7 +674,9 @@ CONFIG_NXWM_TASKBAR_HSPACING=2
 CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_RIGHT is not set
 # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_TASKBAR_ICONSCALE is not set
 # CONFIG_NXWM_DISABLE_MINIMIZE is not set
+# CONFIG_NXWM_TASKBAR_NO_BORDER is not set

 #
 # Tool Bar Configuration
@ -621,6 +689,11 @@ CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
 CONFIG_NXWM_BACKGROUND_IMAGE=""

+#
+# Application Window Configuration
+#
+# CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
+
 #
 # Start Window Configuration
 #
@ -651,7 +724,9 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192
 #
 # Calibration display settings
 #
+CONFIG_NXWM_CALIBRATION_MARGIN=40
 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CALIBRATION_MESSAGES is not set
 # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
@ -663,11 +738,20 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID is not set
+# CONFIG_NXWM_MEDIAPLAYER is not set

 #
 # System NSH Add-Ons
 #

+#
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
 #
 # Custom Free Memory Command
 #
@ -682,6 +766,15 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 #
 # CONFIG_SYSTEM_INSTALL is not set

+#
+# FLASH Erase-all Command
+#
+
+#
+# RAM test
+#
+# CONFIG_SYSTEM_RAMTEST is not set
+
 #
 # readline()
 #
@ -707,3 +800,20 @@ CONFIG_READLINE_ECHO=y
 # Sysinfo
 #
 # CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set