diff --git a/gsmartcontrol/NEWS b/gsmartcontrol/NEWS index 136f20d..14ac30c 100644 --- a/gsmartcontrol/NEWS +++ b/gsmartcontrol/NEWS @@ -1,7 +1,13 @@ -Version 0.8.4, released on --------- - Blacklist Linux Software RAID devices (backported from Debian). - Win32: Use smartmontools-supplied smartctl-nc.exe by default (if found). +Version 0.8.4, released on 2009-03-23 + Linux Software RAID devices are blacklisted now. (backported from Debian). + Attributes tab is before the capabilities tab now. + A man page has been generously contributed by Giuseppe Iuculano + . + Smartctl version now includes the CVS snapshot date (if available). + Windows: Look for "smartctl-nc.exe" instead of "smartctl.exe" by default. + Windows: Use smartmontools-supplied smartctl-nc.exe by default (if found). + Other minor changes (mainly Debian backports). Version 0.8.3, released on 2008-12-27 A random "Smartctl returned an empty output" error on Windows was fixed. diff --git a/gsmartcontrol/README.txt b/gsmartcontrol/README.txt index fa9b139..4d2cfd9 100644 --- a/gsmartcontrol/README.txt +++ b/gsmartcontrol/README.txt @@ -18,26 +18,27 @@ http://gsmartcontrol.berlios.de Features -Automatically report and highlight any abnormal SMART information. +* automatically reports and highlights any anomalies; -Ability to enable / disable SMART. +* allows enabling/disabling SMART; -Ability to enable / disable Automatic Offline Data Collection - A short +* allows enabling/disabling Automatic Offline Data Collection - a short self-check that the drive will perform automatically every four hours with no -impact on performance. +impact on performance; -Ability to set global and per-drive options for smartctl. +* supports configuration of global and per-drive options for smartctl; -Display drive identity, capabilities, attributes, error and self-test logs. +* displays drive identity information, capabilities, attributes, and +self-test/error logs; -Perform SMART self-tests. +* performs SMART self-tests; -Ability to load smartctl output as a "virtual" device, which acts just like a -real (read-only) device. +* can read in smartctl output from a saved file, interpreting it as a +read-only virtual device; -Works on most smartctl-supported operating systems. +* works on most smartctl-supported operating systems; -Extensive help information. +* has extensive help information. @@ -327,9 +328,8 @@ terminal emulator (e.g., xterm, konsole or gnome-terminal): smartctl -a /dev/sda -Note: If using official Windows packages, smartctl.exe doesn't provide any -output. Use smartctl_console.exe instead. The devices name should be /dev/pd1 -for the second physical drive, etc... . +Note: If using Windows, the device name should be /dev/pd1 for the second +physical drive, etc... . If you still think it's a GSmartControl issue, please collect the following information about your system. Without it, it may be very hard or impossible @@ -372,7 +372,7 @@ For license information, see LICENSE_gsmartcontrol.txt file. You may notice that GSmartControl is not licensed under "GNU GPL version X or later", but under "GNU GPL version X and Y". I firmly believe that it's unwise -to license a piece of code under non-existant licenses, whatever anyone else +to license a piece of code under non-existent licenses, whatever anyone else might say. The reason for this is that one simply CANNOT know that, say, in 20 years FSF won't be bought by some corporation who will release GPL version Z which will completely reverse the reasons GPL was created for. diff --git a/gsmartcontrol/TODO b/gsmartcontrol/TODO index ee5f860..a63ccd8 100644 --- a/gsmartcontrol/TODO +++ b/gsmartcontrol/TODO @@ -48,11 +48,21 @@ libdebug: bug: if -q is passed, Execution log doesn't contain libdebug log. (requires per-channel status control). -Move attributes as a second tab -INCLUDE SMARTMONTOOLS LICENSE!! +'-l sataphy' -> SATA Phy event counters: Non-SMART feature, useful to detect SATA cabling problems. + +'-l xerror' -> Extended Comprehensive Error log: An multi-sector and +LBA48 capable version of '-l error'. Output is similar, except more +entries can exists and the high bytes of the registers are also printed. +Some newer drives (Samsung) only write to this log. + +'-l scttemp' -> SCT Temperature history table. See below. + +'-l xselftest' -> Extended Self Test Log: An multi-sector and LBA48 +capable version of '-l selftest'. Output will be similar, except more +entries can exists and the LBA values can be somewhat longer. + -Update copyright years. ----------- Feature List ---------- @@ -88,7 +98,6 @@ Update copyright years. + * Selective self-test log and settings * SCT status and other stuff Display temperature somewhere (use SCT or Attr 194 for this). - Which one is updated more frequently, SCT or attr 194? + * Ability to save this information to a file. + * On info window show: Ask to turn SMART on if it's disabled @@ -98,7 +107,7 @@ Update copyright years. + smartctl exited with error - look it up in error map. -SCT Temperatures (do we use these?) +SCT Temperatures -l scttemp prints temperature and history. -t scttempint,N[,p] (N - count, p - preserve across reset or not). This configures temperature logging interval (1 min by default) and clears the history. diff --git a/gsmartcontrol/configure.ac b/gsmartcontrol/configure.ac index 2c58836..34a6b52 100644 --- a/gsmartcontrol/configure.ac +++ b/gsmartcontrol/configure.ac @@ -36,6 +36,9 @@ AC_CHECK_TOOL(WINDRES, windres) # Win32 external dll stripping (already detected by autoconf) # AC_CHECK_TOOL(STRIP, strip) +# Defines LN_S, needed for man page installation. +AC_PROG_LN_S + # ------------------------------------------------------------------------------------- diff --git a/gsmartcontrol/contrib/cron-based_noadmin/cron_gather_smart.sh b/gsmartcontrol/contrib/cron-based_noadmin/cron_gather_smart.sh index ded2e1f..7ef795a 100755 --- a/gsmartcontrol/contrib/cron-based_noadmin/cron_gather_smart.sh +++ b/gsmartcontrol/contrib/cron-based_noadmin/cron_gather_smart.sh @@ -1,8 +1,8 @@ #!/bin/bash ############################################################################ # Copyright: -# (C) 2008 Alex Butcher -# (C) 2008 Alexander Shaduri +# (C) 2008 - 2009 Alex Butcher +# (C) 2008 - 2009 Alexander Shaduri # License: See LICENSE_whatever.txt file ############################################################################ diff --git a/gsmartcontrol/contrib/cron-based_noadmin/smartctl_subst.sh b/gsmartcontrol/contrib/cron-based_noadmin/smartctl_subst.sh index f36d4d7..365a721 100755 --- a/gsmartcontrol/contrib/cron-based_noadmin/smartctl_subst.sh +++ b/gsmartcontrol/contrib/cron-based_noadmin/smartctl_subst.sh @@ -1,8 +1,8 @@ #!/bin/bash ############################################################################ # Copyright: -# (C) 2008 Alex Butcher -# (C) 2008 Alexander Shaduri +# (C) 2008 - 2009 Alex Butcher +# (C) 2008 - 2009 Alexander Shaduri # License: See LICENSE_whatever.txt file ############################################################################ diff --git a/gsmartcontrol/data/Makefile.am b/gsmartcontrol/data/Makefile.am index fd12e7a..de23ce6 100644 --- a/gsmartcontrol/data/Makefile.am +++ b/gsmartcontrol/data/Makefile.am @@ -1,12 +1,23 @@ SUBDIRS = 16 22 24 32 48 64 128 256 nsis + +dist_man_MANS = gsmartcontrol.1 + +install-extra-mans: + cd $(DESTDIR)$(mandir)/man1 && $(LN_S) -f gsmartcontrol.1 gsmartcontrol-root.1 + +uninstall-extra-mans: + cd $(DESTDIR)$(mandir)/man1 && rm -f gsmartcontrol-root.1 + + # This command is needed if installing with make install (the cache # file is ignored for rpms). gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache +install-data-hook: install-extra-mans update-icon-cache +uninstall-hook: uninstall-extra-mans update-icon-cache + update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating GTK icon cache."; \ diff --git a/gsmartcontrol/data/gsmartcontrol.1 b/gsmartcontrol/data/gsmartcontrol.1 new file mode 100644 index 0000000..29a5527 --- /dev/null +++ b/gsmartcontrol/data/gsmartcontrol.1 @@ -0,0 +1,74 @@ +.TH GSmartControl "1" "" "gsmartcontrol " "User Commands" +.SH NAME +GSmartControl \- Hard disk drive health inspection tool +.SH SYNOPSIS +\fBgsmartcontrol\fP [OPTIONS] + +\fBgsmartcontrol\-root\fP [\fI\fP [OPTIONS]] +.SH DESCRIPTION +\fBGSmartControl\fP is a graphical user interface for smartctl (from +smartmontools), which is a tool for querying and controlling SMART +(Self-Monitoring, Analysis, and Reporting Technology) data on modern hard disk +drives. It allows you to inspect the drive's SMART data to determine its +health, as well as run various tests on it. +.PP +This manual page documents briefly the \fBgsmartcontrol\fP and +\fBgsmartcontrol\-root\fP commands. +.PP +\fBgsmartcontrol\-root\fP command launches \fBgsmartcontrol\fP with +administrative privileges. The \fIdesktop\fP argument specifies which desktop +is currently running, for automatic selection of native su mechanism. Valid +values for \fIdesktop\fP are \fBauto\fP, \fBkde\fP, \fBgnome\fP, \fBother\fP. + +.SH OPTIONS +.SS "Help Options:" +.TP +\fB\-?\fP, \fB\-\-help\fP +Show help options +.TP +\fB\-\-help\-all\fP +Show all help options +.TP +\fB\-\-help\-gtk\fP +Show GTK+ options +.TP +\fB\-\-help\-debug\fR +Show logging options +.SS "Application Options:" +.TP +\fB\-l\fP, \fB\-\-no\-locale\fP +Disable locale +.TP +\fB\-V\fP, \fB\-\-version\fP +Display version information +.TP +\fB\-\-no\-scan\fP +Don't scan devices on startup +.TP +\fB\-\-no\-hide\-tabs\fP +Don't hide non\-identity tabs when SMART is disabled. Useful for debugging. +.TP +\fB\-\-add\-virtual\fP +Load smartctl data from file, creating a virtual drive +.TP +\fB\-\-add\-device\fP +Add this device to device list. Useful with \fB\-\-no\-scan\fP to list certain drives only. +.TP +\fB\-\-display\fP=\fIDISPLAY\fP +X display to use +.TP +\fB\-v\fP, \fB\-\-verbose\fP +Enable verbose logging; same as \fB\-\-verbosity\-level\fP 5 +.TP +\fB\-q\fP, \fB\-\-quiet\fP +Disable logging; same as \fB\-\-verbosity\-level\fP 0 +.TP +\fB\-b\fP, \fB\-\-verbosity\-level\fP +Set verbosity level [0\-5] +.PP +.SH COPYRIGHT +Copyright \(co 2008 \- 2009 Alexander Shaduri +.PP +.SH AUTHOR +This manual page was originally written by Giuseppe Iuculano +, for the Debian project. diff --git a/gsmartcontrol/data/nsis/distribution.txt.in b/gsmartcontrol/data/nsis/distribution.txt.in index 15b92ea..dc36b9d 100644 --- a/gsmartcontrol/data/nsis/distribution.txt.in +++ b/gsmartcontrol/data/nsis/distribution.txt.in @@ -23,6 +23,10 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and * PCRE (http://www.pcre.org/) dll. -* Smartctl binaries - smartctl-nc.exe (compiled without console output), -smartctl.exe (compiled with console output), version 5.38. -http://smartmontools.sf.net/ . +* Smartctl binaries (from smartmontools 5.38, http://smartmontools.sf.net/) - +smartctl-nc.exe (compiled without console output), smartctl.exe (compiled with +console output). + + +The combined distribution is multi-licensed under GNU GPL versions 2 and 3. +See LICENSE_gpl2.txt and LICENSE_gpl3.txt for details. diff --git a/gsmartcontrol/debian.dist/control b/gsmartcontrol/debian.dist/control index a36609b..fdc66f3 100644 --- a/gsmartcontrol/debian.dist/control +++ b/gsmartcontrol/debian.dist/control @@ -15,8 +15,7 @@ Architecture: any Depends: ${shlibs:Depends}, smartmontools Description: Hard disk drive health inspection tool GSmartControl is a graphical user interface for smartctl (from smartmontools - package, see http://smartmontools.sourceforge.net), which is a tool for - querying and controlling SMART (Self-Monitoring, Analysis, and Reporting - Technology) data on modern hard disk drives. It allows you to inspect the - drive's SMART data to determine its health, as well as run various tests on - it. + package), which is a tool for querying and controlling SMART + (Self-Monitoring, Analysis, and Reporting Technology) data on modern hard + disk drives. It allows you to inspect the drive's SMART data to determine its + health, as well as run various tests on it. diff --git a/gsmartcontrol/debian.dist/copyright b/gsmartcontrol/debian.dist/copyright index f43aa76..8944533 100644 --- a/gsmartcontrol/debian.dist/copyright +++ b/gsmartcontrol/debian.dist/copyright @@ -5,7 +5,7 @@ It was downloaded from Copyright: - Copyright (C) 2008 Alexander Shaduri + Copyright (C) 2008 - 2009 Alexander Shaduri License: @@ -27,6 +27,6 @@ On Debian systems, the complete text of the GNU General Public Licenses can be found in `/usr/share/common-licenses/GPL-2' and `/usr/share/common-licenses/GPL-3'. -The Debian packaging is (C) 2008 Alexander Shaduri and +The Debian packaging is (C) 2008 - 2009 Alexander Shaduri and is licensed under the GPLv2 and GPLv3, see above. diff --git a/gsmartcontrol/debian.dist/rules b/gsmartcontrol/debian.dist/rules index a7969db..2b7e9fe 100755 --- a/gsmartcontrol/debian.dist/rules +++ b/gsmartcontrol/debian.dist/rules @@ -25,8 +25,12 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - ./configure --enable-optimize-options=auto --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" +# Add --enable-optimize-options=auto to configure line +# for optimized build (may not work on older gcc versions). build: build-stamp @@ -42,7 +46,7 @@ build-stamp: config.status clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp # Add here commands to clean up after the build process. -$(MAKE) clean @@ -72,7 +76,7 @@ binary-arch: build install # dh_installexamples # dh_install dh_installmenu -# dh_installdebconf +# dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam @@ -95,4 +99,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install diff --git a/gsmartcontrol/file2csource.sh b/gsmartcontrol/file2csource.sh index 6481476..420c0fb 100755 --- a/gsmartcontrol/file2csource.sh +++ b/gsmartcontrol/file2csource.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################ # Copyright: -# (C) 2008 Alexander Shaduri +# (C) 2008 - 2009 Alexander Shaduri # License: See LICENSE_zlib.txt file ############################################################################ diff --git a/gsmartcontrol/gsmartcontrol.kdevelop b/gsmartcontrol/gsmartcontrol.kdevelop index 3dfa52b..7db5a92 100644 --- a/gsmartcontrol/gsmartcontrol.kdevelop +++ b/gsmartcontrol/gsmartcontrol.kdevelop @@ -22,7 +22,7 @@ src/gsmartcontrol - win32 + debuggy /10/devel/projects/gsmartcontrol/current/gsmartcontrol/debuggy diff --git a/gsmartcontrol/gsmartcontrol.spec.in b/gsmartcontrol/gsmartcontrol.spec.in index 1e6818c..e5d3dca 100644 --- a/gsmartcontrol/gsmartcontrol.spec.in +++ b/gsmartcontrol/gsmartcontrol.spec.in @@ -126,6 +126,7 @@ rm -rf %buildroot # %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/* %doc %{_datadir}/doc/gsmartcontrol +%doc %{_mandir}/man1/* %{_datadir}/gsmartcontrol # %{_datadir}/gsmartcontrol/* diff --git a/gsmartcontrol/src/applib/app_gtkmm_features.h b/gsmartcontrol/src/applib/app_gtkmm_features.h index b8c463d..fb434af 100644 --- a/gsmartcontrol/src/applib/app_gtkmm_features.h +++ b/gsmartcontrol/src/applib/app_gtkmm_features.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_gtkmm_utils.cpp b/gsmartcontrol/src/applib/app_gtkmm_utils.cpp index 67249e7..b90bb73 100644 --- a/gsmartcontrol/src/applib/app_gtkmm_utils.cpp +++ b/gsmartcontrol/src/applib/app_gtkmm_utils.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_gtkmm_utils.h b/gsmartcontrol/src/applib/app_gtkmm_utils.h index f03a0ff..9c17b94 100644 --- a/gsmartcontrol/src/applib/app_gtkmm_utils.h +++ b/gsmartcontrol/src/applib/app_gtkmm_utils.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_pango_utils.cpp b/gsmartcontrol/src/applib/app_pango_utils.cpp index 870a2f5..93db20e 100644 --- a/gsmartcontrol/src/applib/app_pango_utils.cpp +++ b/gsmartcontrol/src/applib/app_pango_utils.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_pango_utils.h b/gsmartcontrol/src/applib/app_pango_utils.h index c7ab261..6ecbeab 100644 --- a/gsmartcontrol/src/applib/app_pango_utils.h +++ b/gsmartcontrol/src/applib/app_pango_utils.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_pcrecpp.h b/gsmartcontrol/src/applib/app_pcrecpp.h index fb71443..faa497f 100644 --- a/gsmartcontrol/src/applib/app_pcrecpp.h +++ b/gsmartcontrol/src/applib/app_pcrecpp.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_ui_res_utils.h b/gsmartcontrol/src/applib/app_ui_res_utils.h index c7c2983..527fffc 100644 --- a/gsmartcontrol/src/applib/app_ui_res_utils.h +++ b/gsmartcontrol/src/applib/app_ui_res_utils.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_ui_res_utils_test.cpp b/gsmartcontrol/src/applib/app_ui_res_utils_test.cpp index a1ec0c6..2d06f0b 100644 --- a/gsmartcontrol/src/applib/app_ui_res_utils_test.cpp +++ b/gsmartcontrol/src/applib/app_ui_res_utils_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/app_ui_res_utils_test_data.cpp b/gsmartcontrol/src/applib/app_ui_res_utils_test_data.cpp index a5062b3..abeef86 100644 --- a/gsmartcontrol/src/applib/app_ui_res_utils_test_data.cpp +++ b/gsmartcontrol/src/applib/app_ui_res_utils_test_data.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/cmdex.cpp b/gsmartcontrol/src/applib/cmdex.cpp index 282c914..0641ecf 100644 --- a/gsmartcontrol/src/applib/cmdex.cpp +++ b/gsmartcontrol/src/applib/cmdex.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/cmdex.h b/gsmartcontrol/src/applib/cmdex.h index b5ef142..ae3569e 100644 --- a/gsmartcontrol/src/applib/cmdex.h +++ b/gsmartcontrol/src/applib/cmdex.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/cmdex_sync.cpp b/gsmartcontrol/src/applib/cmdex_sync.cpp index 66d99ac..afcf393 100644 --- a/gsmartcontrol/src/applib/cmdex_sync.cpp +++ b/gsmartcontrol/src/applib/cmdex_sync.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/cmdex_sync.h b/gsmartcontrol/src/applib/cmdex_sync.h index d02f4fb..2144e68 100644 --- a/gsmartcontrol/src/applib/cmdex_sync.h +++ b/gsmartcontrol/src/applib/cmdex_sync.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/cmdex_sync_gui.cpp b/gsmartcontrol/src/applib/cmdex_sync_gui.cpp index 30f1300..bf49782 100644 --- a/gsmartcontrol/src/applib/cmdex_sync_gui.cpp +++ b/gsmartcontrol/src/applib/cmdex_sync_gui.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/cmdex_sync_gui.h b/gsmartcontrol/src/applib/cmdex_sync_gui.h index 98a3ffb..348cf05 100644 --- a/gsmartcontrol/src/applib/cmdex_sync_gui.h +++ b/gsmartcontrol/src/applib/cmdex_sync_gui.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/gui_utils.cpp b/gsmartcontrol/src/applib/gui_utils.cpp index 1b7f97b..6c29482 100644 --- a/gsmartcontrol/src/applib/gui_utils.cpp +++ b/gsmartcontrol/src/applib/gui_utils.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/gui_utils.h b/gsmartcontrol/src/applib/gui_utils.h index 733d0be..44c4fbe 100644 --- a/gsmartcontrol/src/applib/gui_utils.h +++ b/gsmartcontrol/src/applib/gui_utils.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/selftest.cpp b/gsmartcontrol/src/applib/selftest.cpp index f5b5ec1..4c16fd1 100644 --- a/gsmartcontrol/src/applib/selftest.cpp +++ b/gsmartcontrol/src/applib/selftest.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/selftest.h b/gsmartcontrol/src/applib/selftest.h index 0a71f47..90fa472 100644 --- a/gsmartcontrol/src/applib/selftest.h +++ b/gsmartcontrol/src/applib/selftest.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/smartctl_executor.cpp b/gsmartcontrol/src/applib/smartctl_executor.cpp index a4f773e..0aabbee 100644 --- a/gsmartcontrol/src/applib/smartctl_executor.cpp +++ b/gsmartcontrol/src/applib/smartctl_executor.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/smartctl_executor.h b/gsmartcontrol/src/applib/smartctl_executor.h index c6fbcbf..1e8fa9a 100644 --- a/gsmartcontrol/src/applib/smartctl_executor.h +++ b/gsmartcontrol/src/applib/smartctl_executor.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/smartctl_executor_gui.h b/gsmartcontrol/src/applib/smartctl_executor_gui.h index c15d8a0..954639c 100644 --- a/gsmartcontrol/src/applib/smartctl_executor_gui.h +++ b/gsmartcontrol/src/applib/smartctl_executor_gui.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/smartctl_executor_test.cpp b/gsmartcontrol/src/applib/smartctl_executor_test.cpp index 8ea8d03..9c73b23 100644 --- a/gsmartcontrol/src/applib/smartctl_executor_test.cpp +++ b/gsmartcontrol/src/applib/smartctl_executor_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/smartctl_parser.cpp b/gsmartcontrol/src/applib/smartctl_parser.cpp index aeee57e..b98ac7e 100644 --- a/gsmartcontrol/src/applib/smartctl_parser.cpp +++ b/gsmartcontrol/src/applib/smartctl_parser.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -148,23 +148,34 @@ bool SmartctlParser::parse_full(const std::string& full) // version info - std::string version = parse_version(s); - if (version.empty()) { + std::string version, version_full; + if (!parse_version(s, version, version_full)) { set_error_msg("Cannot extract smartctl version information."); debug_out_warn("app", DBG_FUNC_MSG << "Cannot extract version information. Returning.\n"); return false; } else { - StorageProperty p; - p.set_name("Smartctl version", "smartctl_version"); - p.reported_value = version; - p.value_type = StorageProperty::value_type_string; - p.value_string = p.reported_value; - p.section = StorageProperty::section_info; // add to info section - add_property(p); + { + StorageProperty p; + p.set_name("Smartctl version", "smartctl_version"); + p.reported_value = version; + p.value_type = StorageProperty::value_type_string; + p.value_string = p.reported_value; + p.section = StorageProperty::section_info; // add to info section + add_property(p); + } + { + StorageProperty p; + p.set_name("Smartctl version", "smartctl_version_full"); + p.reported_value = version_full; + p.value_type = StorageProperty::value_type_string; + p.value_string = p.reported_value; + p.section = StorageProperty::section_info; // add to info section + add_property(p); + } } - if (!check_version(version)) { + if (!check_version(version, version_full)) { set_error_msg("Incompatible smartctl version."); debug_out_warn("app", DBG_FUNC_MSG << "Incompatible smartctl version. Returning.\n"); return false; @@ -210,25 +221,24 @@ bool SmartctlParser::parse_full(const std::string& full) // Supply output of "smartctl --version" here. -// returns empty string on failure. Non-unix newlines in s are ok. -std::string SmartctlParser::parse_version(const std::string& s) +// returns false on failure. Non-unix newlines in s are ok. +bool SmartctlParser::parse_version(const std::string& s, std::string& version, std::string& version_full) { - std::string version; - // e.g. "smartctl version 5.37" or "smartctl 5.39" - if (!app_pcre_match("/^smartctl (?:version )?([0-9][^ \\t\\n\\r]+)/mi", s, &version)) { + if (!app_pcre_match("/^smartctl (?:version )?(([0-9][^ \\t\\n\\r]+)(?: [0-9 :-]+)?)/mi", s, &version_full, &version)) { debug_out_error("app", DBG_FUNC_MSG << "No smartctl version information found in supplied string.\n"); - return std::string(); + return false; } + hz::string_trim(version_full); - return version; + return true; } // check that the version of smartctl output can be parsed with this parser. -bool SmartctlParser::check_version(const std::string& version_str) +bool SmartctlParser::check_version(const std::string& version_str, const std::string& version_full_str) { // tested with 5.1-xx versions (1 - 18), and 5.[20 - 38]. // note: 5.1-11 (maybe others too) with scsi disk gives non-parsable output (why?). @@ -352,7 +362,7 @@ bool SmartctlParser::parse_section_info(const std::string& body) // split by lines. // e.g. Device Model: ST3500630AS - pcrecpp::RE re = app_pcre_re("/^([^:\\n]+):[ \\t]*(.*)$/mi"); + pcrecpp::RE re = app_pcre_re("/^([^\\n]+): [ \\t]*(.*)$/miU"); // ungreedy std::string name, value; pcrecpp::StringPiece input(body); // position tracker @@ -467,6 +477,9 @@ bool SmartctlParser::parse_section_info_property(StorageProperty& p) } else { debug_out_warn("app", DBG_FUNC_MSG << "Unknown attribute \"" << p.reported_name << "\"\n"); // this is not an error, just unknown attribute. treat it as string. + // Don't highlight it with warning, it may just be a new smartctl feature. + p.value_type = StorageProperty::value_type_string; + p.value_string = p.reported_value; } return true; diff --git a/gsmartcontrol/src/applib/smartctl_parser.h b/gsmartcontrol/src/applib/smartctl_parser.h index ad6ad66..4d1942f 100644 --- a/gsmartcontrol/src/applib/smartctl_parser.h +++ b/gsmartcontrol/src/applib/smartctl_parser.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -28,13 +28,12 @@ class SmartctlParser { bool parse_full(const std::string& s); - // supply output of "smartctl --version" here. - // returns empty string on failure. - static std::string parse_version(const std::string& s); + // supply any output of smartctl here. + static bool parse_version(const std::string& s, std::string& version, std::string& version_full); // check that the version of smartctl output can be parsed with this parser. - static bool check_version(const std::string& version_str); + static bool check_version(const std::string& version_str, const std::string& version_full_str); // convert e.g. "1,000,204,886,016 bytes" to 1.00 TiB [931.51 GB, 1000204886016 bytes] diff --git a/gsmartcontrol/src/applib/smartctl_parser_test.cpp b/gsmartcontrol/src/applib/smartctl_parser_test.cpp index 20e2207..3b3f642 100644 --- a/gsmartcontrol/src/applib/smartctl_parser_test.cpp +++ b/gsmartcontrol/src/applib/smartctl_parser_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/spawn_test.cpp b/gsmartcontrol/src/applib/spawn_test.cpp index 4701114..ee5fe9d 100644 --- a/gsmartcontrol/src/applib/spawn_test.cpp +++ b/gsmartcontrol/src/applib/spawn_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_detector.cpp b/gsmartcontrol/src/applib/storage_detector.cpp index b5295fb..88003b4 100644 --- a/gsmartcontrol/src/applib/storage_detector.cpp +++ b/gsmartcontrol/src/applib/storage_detector.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_detector.h b/gsmartcontrol/src/applib/storage_detector.h index 2bbec46..b24e45e 100644 --- a/gsmartcontrol/src/applib/storage_detector.h +++ b/gsmartcontrol/src/applib/storage_detector.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_detector_test.cpp b/gsmartcontrol/src/applib/storage_detector_test.cpp index 1e02609..da3acc8 100644 --- a/gsmartcontrol/src/applib/storage_detector_test.cpp +++ b/gsmartcontrol/src/applib/storage_detector_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_device.cpp b/gsmartcontrol/src/applib/storage_device.cpp index 90284d8..5259156 100644 --- a/gsmartcontrol/src/applib/storage_device.cpp +++ b/gsmartcontrol/src/applib/storage_device.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -55,8 +55,8 @@ std::string StorageDevice::parse_basic_data(bool do_set_properties, bool emit_si return "Cannot read information from an empty string."; } - std::string version = SmartctlParser::parse_version(this->info_output_); - if (version.empty()) // is this smartctl data at all? + std::string version, version_full; + if (!SmartctlParser::parse_version(this->info_output_, version, version_full)) // is this smartctl data at all? return "Cannot get smartctl version information."; // detect type. note: we can't distinguish between sata and scsi (on linux, for -d ata switch). diff --git a/gsmartcontrol/src/applib/storage_device.h b/gsmartcontrol/src/applib/storage_device.h index 372af39..d11c60c 100644 --- a/gsmartcontrol/src/applib/storage_device.h +++ b/gsmartcontrol/src/applib/storage_device.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_property.cpp b/gsmartcontrol/src/applib/storage_property.cpp index c86ef6c..fc8d03d 100644 --- a/gsmartcontrol/src/applib/storage_property.cpp +++ b/gsmartcontrol/src/applib/storage_property.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_property.h b/gsmartcontrol/src/applib/storage_property.h index 2a333e8..6224198 100644 --- a/gsmartcontrol/src/applib/storage_property.h +++ b/gsmartcontrol/src/applib/storage_property.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_property_colors.h b/gsmartcontrol/src/applib/storage_property_colors.h index ba44f0b..bee1f46 100644 --- a/gsmartcontrol/src/applib/storage_property_colors.h +++ b/gsmartcontrol/src/applib/storage_property_colors.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -12,7 +12,7 @@ // colors for tree rows -inline bool app_property_get_row_hilight_colors(StorageProperty::warning_t warning, std::string& fg, std::string& bg) +inline bool app_property_get_row_highlight_colors(StorageProperty::warning_t warning, std::string& fg, std::string& bg) { // Note: we're setting both fg and bg, to avoid theme conflicts. if (warning == StorageProperty::warning_notice) { @@ -34,7 +34,7 @@ inline bool app_property_get_row_hilight_colors(StorageProperty::warning_t warni // colors for labels -inline bool app_property_get_label_hilight_color(StorageProperty::warning_t warning, std::string& fg) +inline bool app_property_get_label_highlight_color(StorageProperty::warning_t warning, std::string& fg) { if (warning == StorageProperty::warning_notice) { fg = "#770000"; // very dark red @@ -56,7 +56,7 @@ inline bool app_property_get_label_hilight_color(StorageProperty::warning_t warn inline std::string storage_property_get_warning_reason(const StorageProperty& p) { std::string fg, start, stop; - if (app_property_get_label_hilight_color(p.warning, fg)) { + if (app_property_get_label_highlight_color(p.warning, fg)) { start = ""; stop = ""; } diff --git a/gsmartcontrol/src/applib/storage_property_descr.cpp b/gsmartcontrol/src/applib/storage_property_descr.cpp index f1c0ebc..9082c68 100644 --- a/gsmartcontrol/src/applib/storage_property_descr.cpp +++ b/gsmartcontrol/src/applib/storage_property_descr.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_property_descr.h b/gsmartcontrol/src/applib/storage_property_descr.h index 06308a1..43ade6d 100644 --- a/gsmartcontrol/src/applib/storage_property_descr.h +++ b/gsmartcontrol/src/applib/storage_property_descr.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/storage_settings.h b/gsmartcontrol/src/applib/storage_settings.h index 4624497..fd96e80 100644 --- a/gsmartcontrol/src/applib/storage_settings.h +++ b/gsmartcontrol/src/applib/storage_settings.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/applib/wrapping_label.h b/gsmartcontrol/src/applib/wrapping_label.h index 83eef20..ffae559 100644 --- a/gsmartcontrol/src/applib/wrapping_label.h +++ b/gsmartcontrol/src/applib/wrapping_label.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/global_macros.h b/gsmartcontrol/src/global_macros.h index aa68e2d..656779e 100644 --- a/gsmartcontrol/src/global_macros.h +++ b/gsmartcontrol/src/global_macros.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_about_dialog.cpp b/gsmartcontrol/src/gsc_about_dialog.cpp index 7e0dccc..234eba3 100644 --- a/gsmartcontrol/src/gsc_about_dialog.cpp +++ b/gsmartcontrol/src/gsc_about_dialog.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -47,7 +47,7 @@ GscAboutDialog::GscAboutDialog(BaseObjectType* gtkcobj, const app_ui_res_ref_t& set_license(LicenseTextResData().get_string()); // spammers go away - set_copyright("Copyright (C) 2008 Alexander Shaduri " ""); + set_copyright("Copyright (C) 2008 - 2009 Alexander Shaduri " ""); std::string authors_str = AuthorsTextResData().get_string(); diff --git a/gsmartcontrol/src/gsc_about_dialog.h b/gsmartcontrol/src/gsc_about_dialog.h index 0067541..ae00748 100644 --- a/gsmartcontrol/src/gsc_about_dialog.h +++ b/gsmartcontrol/src/gsc_about_dialog.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_executor_error_dialog.cpp b/gsmartcontrol/src/gsc_executor_error_dialog.cpp index b3c04d6..b112357 100644 --- a/gsmartcontrol/src/gsc_executor_error_dialog.cpp +++ b/gsmartcontrol/src/gsc_executor_error_dialog.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_executor_error_dialog.h b/gsmartcontrol/src/gsc_executor_error_dialog.h index 9831703..5e5a3f9 100644 --- a/gsmartcontrol/src/gsc_executor_error_dialog.h +++ b/gsmartcontrol/src/gsc_executor_error_dialog.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_executor_log_window.cpp b/gsmartcontrol/src/gsc_executor_log_window.cpp index 6769a66..5788ad6 100644 --- a/gsmartcontrol/src/gsc_executor_log_window.cpp +++ b/gsmartcontrol/src/gsc_executor_log_window.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_executor_log_window.h b/gsmartcontrol/src/gsc_executor_log_window.h index 4388e67..8190474 100644 --- a/gsmartcontrol/src/gsc_executor_log_window.h +++ b/gsmartcontrol/src/gsc_executor_log_window.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_help_window.cpp b/gsmartcontrol/src/gsc_help_window.cpp index 3e189d2..e0a968c 100644 --- a/gsmartcontrol/src/gsc_help_window.cpp +++ b/gsmartcontrol/src/gsc_help_window.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_help_window.h b/gsmartcontrol/src/gsc_help_window.h index 5563f71..b328c08 100644 --- a/gsmartcontrol/src/gsc_help_window.h +++ b/gsmartcontrol/src/gsc_help_window.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_info_window.cpp b/gsmartcontrol/src/gsc_info_window.cpp index d60f24a..3f82be6 100644 --- a/gsmartcontrol/src/gsc_info_window.cpp +++ b/gsmartcontrol/src/gsc_info_window.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -76,7 +76,7 @@ namespace { label->set_flags(label->get_flags() & ~Gtk::CAN_FOCUS); std::string fg; - if (app_property_get_label_hilight_color(iter->property->warning, fg)) + if (app_property_get_label_highlight_color(iter->property->warning, fg)) label->set_markup("" + label_text + ""); vbox->pack_start(*label, false, false); @@ -100,7 +100,7 @@ namespace { Gtk::CellRendererText* crt = hz::down_cast(cr); if (crt) { std::string fg, bg; - if (app_property_get_row_hilight_colors(p->warning, fg, bg)) { + if (app_property_get_row_highlight_colors(p->warning, fg, bg)) { // Note: property_cell_background makes horizontal tree lines disappear around it, // but property_background doesn't play nice with sorted column color. crt->property_cell_background() = bg; @@ -115,7 +115,7 @@ namespace { } - inline void app_hilight_tab_label(Gtk::Widget* label_widget, + inline void app_highlight_tab_label(Gtk::Widget* label_widget, StorageProperty::warning_t warning, const Glib::ustring& original_label) { Gtk::Label* label = hz::down_cast(label_widget); @@ -128,7 +128,7 @@ namespace { } std::string fg; - if (app_property_get_label_hilight_color(warning, fg)) + if (app_property_get_label_highlight_color(warning, fg)) label->set_markup_with_mnemonic("" + original_label + ""); } @@ -358,8 +358,10 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests for (prop_iterator iter = props.begin(); iter != props.end(); ++iter) { if (iter->section == StorageProperty::section_info) { - if (iter->generic_name == "smartctl_version") { + if (iter->generic_name == "smartctl_version_full") { version_props.push_back(*iter); + } else if (iter->generic_name == "smartctl_version") { + continue; // we use the full version string instead. } else { id_props.push_back(*iter); } @@ -411,7 +413,7 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests value->set_markup(Glib::Markup::escape_text(iter->format_value())); std::string fg; - if (app_property_get_label_hilight_color(iter->warning, fg)) { + if (app_property_get_label_highlight_color(iter->warning, fg)) { name->set_markup(""+ name->get_label() + ""); value->set_markup(""+ value->get_label() + ""); } @@ -434,7 +436,7 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests identity_table->show_all(); // tab label - app_hilight_tab_label(lookup_widget("identity_tab_label"), max_warning, tab_identity_name); + app_highlight_tab_label(lookup_widget("identity_tab_label"), max_warning, tab_identity_name); } while (false); @@ -529,7 +531,7 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests } // tab label - app_hilight_tab_label(lookup_widget("capabilities_tab_label"), max_warning, tab_capabilities_name); + app_highlight_tab_label(lookup_widget("capabilities_tab_label"), max_warning, tab_capabilities_name); } while (false); @@ -678,7 +680,7 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests app_set_top_labels(label_vbox, label_strings); // tab label - app_hilight_tab_label(lookup_widget("attributes_tab_label"), max_warning, tab_attributes_name); + app_highlight_tab_label(lookup_widget("attributes_tab_label"), max_warning, tab_attributes_name); } while (false); @@ -816,7 +818,7 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests app_set_top_labels(label_vbox, label_strings); // tab label - app_hilight_tab_label(lookup_widget("error_log_tab_label"), max_warning, tab_error_log_name); + app_highlight_tab_label(lookup_widget("error_log_tab_label"), max_warning, tab_error_log_name); } while (false); @@ -929,7 +931,7 @@ void GscInfoWindow::fill_ui_with_info(bool scan, bool clear_ui, bool clear_tests app_set_top_labels(label_vbox, label_strings); // tab label - app_hilight_tab_label(lookup_widget("selftest_log_tab_label"), max_warning, tab_selftest_log_name); + app_highlight_tab_label(lookup_widget("selftest_log_tab_label"), max_warning, tab_selftest_log_name); } while (false); @@ -1087,7 +1089,7 @@ void GscInfoWindow::clear_ui_info(bool clear_tests_too) } // tab label - app_hilight_tab_label(lookup_widget("identity_tab_label"), StorageProperty::warning_none, tab_identity_name); + app_highlight_tab_label(lookup_widget("identity_tab_label"), StorageProperty::warning_none, tab_identity_name); } { @@ -1103,7 +1105,7 @@ void GscInfoWindow::clear_ui_info(bool clear_tests_too) } // tab label - app_hilight_tab_label(lookup_widget("capabilities_tab_label"), StorageProperty::warning_none, tab_capabilities_name); + app_highlight_tab_label(lookup_widget("capabilities_tab_label"), StorageProperty::warning_none, tab_capabilities_name); } { @@ -1120,7 +1122,7 @@ void GscInfoWindow::clear_ui_info(bool clear_tests_too) } // tab label - app_hilight_tab_label(lookup_widget("attributes_tab_label"), StorageProperty::warning_none, tab_attributes_name); + app_highlight_tab_label(lookup_widget("attributes_tab_label"), StorageProperty::warning_none, tab_attributes_name); } { @@ -1144,7 +1146,7 @@ void GscInfoWindow::clear_ui_info(bool clear_tests_too) } // tab label - app_hilight_tab_label(lookup_widget("error_log_tab_label"), StorageProperty::warning_none, tab_error_log_name); + app_highlight_tab_label(lookup_widget("error_log_tab_label"), StorageProperty::warning_none, tab_error_log_name); } { @@ -1161,7 +1163,7 @@ void GscInfoWindow::clear_ui_info(bool clear_tests_too) } // tab label - app_hilight_tab_label(lookup_widget("selftest_log_tab_label"), StorageProperty::warning_none, tab_selftest_log_name); + app_highlight_tab_label(lookup_widget("selftest_log_tab_label"), StorageProperty::warning_none, tab_selftest_log_name); } { @@ -1217,7 +1219,7 @@ void GscInfoWindow::clear_ui_info(bool clear_tests_too) // tab label - app_hilight_tab_label(lookup_widget("test_tab_label"), StorageProperty::warning_none, tab_test_name); + app_highlight_tab_label(lookup_widget("test_tab_label"), StorageProperty::warning_none, tab_test_name); } } diff --git a/gsmartcontrol/src/gsc_info_window.h b/gsmartcontrol/src/gsc_info_window.h index 8437aec..7f0507f 100644 --- a/gsmartcontrol/src/gsc_info_window.h +++ b/gsmartcontrol/src/gsc_info_window.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_init.cpp b/gsmartcontrol/src/gsc_init.cpp index d4e2ee2..d921da2 100644 --- a/gsmartcontrol/src/gsc_init.cpp +++ b/gsmartcontrol/src/gsc_init.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -194,7 +194,7 @@ inline void app_print_version_info() std::string warningtext = std::string("\nWarning: GSmartControl"); warningtext += " comes with ABSOLUTELY NO WARRANTY.\n"; warningtext += "See LICENSE_gsmartcontrol.txt file for details.\n"; - warningtext += "\nCopyright (C) 2008 Alexander Shaduri \n\n"; + warningtext += "\nCopyright (C) 2008 - 2009 Alexander Shaduri \n\n"; std::printf("%s%s", versiontext.c_str(), warningtext.c_str()); } diff --git a/gsmartcontrol/src/gsc_init.h b/gsmartcontrol/src/gsc_init.h index 8a62781..63d70f3 100644 --- a/gsmartcontrol/src/gsc_init.h +++ b/gsmartcontrol/src/gsc_init.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_main.cpp b/gsmartcontrol/src/gsc_main.cpp index b07237e..036f3b1 100644 --- a/gsmartcontrol/src/gsc_main.cpp +++ b/gsmartcontrol/src/gsc_main.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_main_window.cpp b/gsmartcontrol/src/gsc_main_window.cpp index 2320786..700ca9e 100644 --- a/gsmartcontrol/src/gsc_main_window.cpp +++ b/gsmartcontrol/src/gsc_main_window.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -18,7 +18,7 @@ #include "applib/smartctl_executor.h" // get_smartctl_binary() #include "applib/smartctl_executor_gui.h" #include "applib/app_gtkmm_utils.h" // app_gtkmm_* -#include "applib/storage_property_colors.h" // app_property_get_label_hilight_color +#include "applib/storage_property_colors.h" // app_property_get_label_highlight_color #include "applib/app_pcrecpp.h" // app_pcre_match #include "gsc_init.h" // app_quit() @@ -96,7 +96,8 @@ GscMainWindow::GscMainWindow(BaseObjectType* gtkcobj, const app_ui_res_ref_t& re break; } - if (SmartctlParser::parse_version(output).empty()) { + std::string version, version_full; + if (!SmartctlParser::parse_version(output, version, version_full)) { error_msg = "Smartctl returned invalid output."; break; } @@ -905,7 +906,7 @@ void GscMainWindow::update_status_widgets() if (health_prop.generic_name == "overall_health") { health_label->set_text(health_prop.format_value()); std::string fg; - if (app_property_get_label_hilight_color(health_prop.warning, fg)) { + if (app_property_get_label_highlight_color(health_prop.warning, fg)) { health_label->set_markup(""+ health_label->get_text() + ""); } // don't set description tooltip - we already have the basic one. diff --git a/gsmartcontrol/src/gsc_main_window.h b/gsmartcontrol/src/gsc_main_window.h index 427751f..f8e0298 100644 --- a/gsmartcontrol/src/gsc_main_window.h +++ b/gsmartcontrol/src/gsc_main_window.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_main_window_iconview.h b/gsmartcontrol/src/gsc_main_window_iconview.h index f030d08..9323534 100644 --- a/gsmartcontrol/src/gsc_main_window_iconview.h +++ b/gsmartcontrol/src/gsc_main_window_iconview.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ @@ -194,7 +194,7 @@ class GscMainWindowIconView : public Gtk::IconView { gtk_icon_view_set_cursor(GTK_ICON_VIEW(this->gobj()), tpath.gobj(), cell->gobj(), false); } #endif - this->select_path(tpath); // hilight it + this->select_path(tpath); // highlight it } ++num_icons; diff --git a/gsmartcontrol/src/gsc_preferences_window.cpp b/gsmartcontrol/src/gsc_preferences_window.cpp index d84fdfc..f842745 100644 --- a/gsmartcontrol/src/gsc_preferences_window.cpp +++ b/gsmartcontrol/src/gsc_preferences_window.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_preferences_window.h b/gsmartcontrol/src/gsc_preferences_window.h index f593d24..fb11cd4 100644 --- a/gsmartcontrol/src/gsc_preferences_window.h +++ b/gsmartcontrol/src/gsc_preferences_window.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_settings.h b/gsmartcontrol/src/gsc_settings.h index 0a97d01..cae6f97 100644 --- a/gsmartcontrol/src/gsc_settings.h +++ b/gsmartcontrol/src/gsc_settings.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/gsc_text_window.h b/gsmartcontrol/src/gsc_text_window.h index cb707b0..7baf3cc 100644 --- a/gsmartcontrol/src/gsc_text_window.h +++ b/gsmartcontrol/src/gsc_text_window.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_gsmartcontrol.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/any_convert.h b/gsmartcontrol/src/hz/any_convert.h index 7803060..b1a2b70 100644 --- a/gsmartcontrol/src/hz/any_convert.h +++ b/gsmartcontrol/src/hz/any_convert.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/any_type.h b/gsmartcontrol/src/hz/any_type.h index 26e7512..eb3705a 100644 --- a/gsmartcontrol/src/hz/any_type.h +++ b/gsmartcontrol/src/hz/any_type.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2000 - 2008 Kevlin Henney - (C) 2008 Alexander Shaduri + (C) 2000 - 2009 Kevlin Henney + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/any_type_holder.h b/gsmartcontrol/src/hz/any_type_holder.h index 619afc9..97659e5 100644 --- a/gsmartcontrol/src/hz/any_type_holder.h +++ b/gsmartcontrol/src/hz/any_type_holder.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2000 - 2008 Kevlin Henney - (C) 2008 Alexander Shaduri + (C) 2000 - 2009 Kevlin Henney + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/any_type_test.cpp b/gsmartcontrol/src/hz/any_type_test.cpp index 605e90d..8de269d 100644 --- a/gsmartcontrol/src/hz/any_type_test.cpp +++ b/gsmartcontrol/src/hz/any_type_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/ascii.h b/gsmartcontrol/src/hz/ascii.h index d5ea615..1573c88 100644 --- a/gsmartcontrol/src/hz/ascii.h +++ b/gsmartcontrol/src/hz/ascii.h @@ -2,7 +2,7 @@ Copyright: (C) 1992, 1993 The Regents of the University of California License: See LICENSE_bsd-ucb.txt file - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/bad_cast_exception.h b/gsmartcontrol/src/hz/bad_cast_exception.h index 12c8ba1..557eb08 100644 --- a/gsmartcontrol/src/hz/bad_cast_exception.h +++ b/gsmartcontrol/src/hz/bad_cast_exception.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/bin2ascii_encoder.h b/gsmartcontrol/src/hz/bin2ascii_encoder.h index 9cfae7e..92aae6d 100644 --- a/gsmartcontrol/src/hz/bin2ascii_encoder.h +++ b/gsmartcontrol/src/hz/bin2ascii_encoder.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/bin2ascii_encoder_test.cpp b/gsmartcontrol/src/hz/bin2ascii_encoder_test.cpp index 0af1f16..bcbe01d 100644 --- a/gsmartcontrol/src/hz/bin2ascii_encoder_test.cpp +++ b/gsmartcontrol/src/hz/bin2ascii_encoder_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/common_types.h b/gsmartcontrol/src/hz/common_types.h index f0172c7..bfd427e 100644 --- a/gsmartcontrol/src/hz/common_types.h +++ b/gsmartcontrol/src/hz/common_types.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Alexander Shaduri + (C) 2003 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/data_file.h b/gsmartcontrol/src/hz/data_file.h index 914228c..0669de3 100644 --- a/gsmartcontrol/src/hz/data_file.h +++ b/gsmartcontrol/src/hz/data_file.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2004 - 2008 Alexander Shaduri + (C) 2004 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/debug.h b/gsmartcontrol/src/hz/debug.h index daa12d4..4b9d90d 100644 --- a/gsmartcontrol/src/hz/debug.h +++ b/gsmartcontrol/src/hz/debug.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/down_cast.h b/gsmartcontrol/src/hz/down_cast.h index e587998..be2c283 100644 --- a/gsmartcontrol/src/hz/down_cast.h +++ b/gsmartcontrol/src/hz/down_cast.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Alexander Shaduri + (C) 2003 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/down_cast_test.cpp b/gsmartcontrol/src/hz/down_cast_test.cpp index 8f2af55..ea83db8 100644 --- a/gsmartcontrol/src/hz/down_cast_test.cpp +++ b/gsmartcontrol/src/hz/down_cast_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/env_tools.h b/gsmartcontrol/src/hz/env_tools.h index 10dc877..25b099e 100644 --- a/gsmartcontrol/src/hz/env_tools.h +++ b/gsmartcontrol/src/hz/env_tools.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/errno_string.h b/gsmartcontrol/src/hz/errno_string.h index a0618ff..4ac5b2d 100644 --- a/gsmartcontrol/src/hz/errno_string.h +++ b/gsmartcontrol/src/hz/errno_string.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/errno_string_test.cpp b/gsmartcontrol/src/hz/errno_string_test.cpp index fcec734..b5acd38 100644 --- a/gsmartcontrol/src/hz/errno_string_test.cpp +++ b/gsmartcontrol/src/hz/errno_string_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/error.h b/gsmartcontrol/src/hz/error.h index 889c101..8e9759c 100644 --- a/gsmartcontrol/src/hz/error.h +++ b/gsmartcontrol/src/hz/error.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/error_holder.h b/gsmartcontrol/src/hz/error_holder.h index d64a2e5..bd5ef61 100644 --- a/gsmartcontrol/src/hz/error_holder.h +++ b/gsmartcontrol/src/hz/error_holder.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/exceptions.h b/gsmartcontrol/src/hz/exceptions.h index 23254c8..af3ceb2 100644 --- a/gsmartcontrol/src/hz/exceptions.h +++ b/gsmartcontrol/src/hz/exceptions.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/format_unit.h b/gsmartcontrol/src/hz/format_unit.h index 24a9262..b996fc3 100644 --- a/gsmartcontrol/src/hz/format_unit.h +++ b/gsmartcontrol/src/hz/format_unit.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Alexander Shaduri + (C) 2003 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/format_unit_test.cpp b/gsmartcontrol/src/hz/format_unit_test.cpp index ee5a19e..5af5b37 100644 --- a/gsmartcontrol/src/hz/format_unit_test.cpp +++ b/gsmartcontrol/src/hz/format_unit_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_common.h b/gsmartcontrol/src/hz/fs_common.h index e618a06..febe5db 100644 --- a/gsmartcontrol/src/hz/fs_common.h +++ b/gsmartcontrol/src/hz/fs_common.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_dir.h b/gsmartcontrol/src/hz/fs_dir.h index 8622b96..ef26180 100644 --- a/gsmartcontrol/src/hz/fs_dir.h +++ b/gsmartcontrol/src/hz/fs_dir.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_dir_test.cpp b/gsmartcontrol/src/hz/fs_dir_test.cpp index acb13ea..4e77e88 100644 --- a/gsmartcontrol/src/hz/fs_dir_test.cpp +++ b/gsmartcontrol/src/hz/fs_dir_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_error_holder.h b/gsmartcontrol/src/hz/fs_error_holder.h index 9f04bd1..cdefe7a 100644 --- a/gsmartcontrol/src/hz/fs_error_holder.h +++ b/gsmartcontrol/src/hz/fs_error_holder.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_file.h b/gsmartcontrol/src/hz/fs_file.h index af0b9a6..7a58a03 100644 --- a/gsmartcontrol/src/hz/fs_file.h +++ b/gsmartcontrol/src/hz/fs_file.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ @@ -541,16 +541,21 @@ inline bool File::move(const std::string& to) return false; } - // win32 rename() doesn't replace contents if newpath exists and says "file exists". + bool success = (rename(path_.c_str(), to.c_str()) == 0); + #ifdef _WIN32 -/// FIXME: Try to rename first, unlink/rename again later. This way we have at least some atomicity. - // try remove it if it's a file. no error checks here - rename() will report the needed messages. - File dest_file(to); - if (dest_file.is_file()) - dest_file.remove(); + // win32 rename() doesn't replace contents if newpath exists and says "file exists". + // Try to rename first, then unlink/rename again. This way we have at least some atomicity. + if (!success && errno == EACCES) { + File dest_file(to); + if (dest_file.is_file()) { + dest_file.remove(); // no error tracking here, rename() will report the needed error. + success = (rename(path_.c_str(), to.c_str()) == 0); + } + } #endif - if (rename(path_.c_str(), to.c_str()) != 0) + if (!success) set_error(HZ__("Unable to move filesystem entry \"/path1/\" to \"/path2/\": /errno/."), errno, path_, to); return ok(); diff --git a/gsmartcontrol/src/hz/fs_file_test.cpp b/gsmartcontrol/src/hz/fs_file_test.cpp index 23e3dfc..ca6f6c6 100644 --- a/gsmartcontrol/src/hz/fs_file_test.cpp +++ b/gsmartcontrol/src/hz/fs_file_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_path.h b/gsmartcontrol/src/hz/fs_path.h index 5914c38..e0a9e4c 100644 --- a/gsmartcontrol/src/hz/fs_path.h +++ b/gsmartcontrol/src/hz/fs_path.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_path_test.cpp b/gsmartcontrol/src/hz/fs_path_test.cpp index 626abc7..12131f9 100644 --- a/gsmartcontrol/src/hz/fs_path_test.cpp +++ b/gsmartcontrol/src/hz/fs_path_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_path_utils.h b/gsmartcontrol/src/hz/fs_path_utils.h index 61fd05d..48daf4f 100644 --- a/gsmartcontrol/src/hz/fs_path_utils.h +++ b/gsmartcontrol/src/hz/fs_path_utils.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/fs_tools.h b/gsmartcontrol/src/hz/fs_tools.h index 69b8c1c..1962816 100644 --- a/gsmartcontrol/src/hz/fs_tools.h +++ b/gsmartcontrol/src/hz/fs_tools.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/hz_config.h b/gsmartcontrol/src/hz/hz_config.h index ae606f3..c3c8d61 100644 --- a/gsmartcontrol/src/hz/hz_config.h +++ b/gsmartcontrol/src/hz/hz_config.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/i18n.h b/gsmartcontrol/src/hz/i18n.h index 62fa707..0510962 100644 --- a/gsmartcontrol/src/hz/i18n.h +++ b/gsmartcontrol/src/hz/i18n.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/instance_manager.h b/gsmartcontrol/src/hz/instance_manager.h index 26d628f..fc2542e 100644 --- a/gsmartcontrol/src/hz/instance_manager.h +++ b/gsmartcontrol/src/hz/instance_manager.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/intrusive_ptr.h b/gsmartcontrol/src/hz/intrusive_ptr.h index a42893e..dd94ff9 100644 --- a/gsmartcontrol/src/hz/intrusive_ptr.h +++ b/gsmartcontrol/src/hz/intrusive_ptr.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2001 - 2008 Peter Dimov - (C) 2008 Alexander Shaduri + (C) 2001 - 2009 Peter Dimov + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/intrusive_scoped_lock.h b/gsmartcontrol/src/hz/intrusive_scoped_lock.h index ea02c1d..6a0c336 100644 --- a/gsmartcontrol/src/hz/intrusive_scoped_lock.h +++ b/gsmartcontrol/src/hz/intrusive_scoped_lock.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/launch_url.h b/gsmartcontrol/src/hz/launch_url.h index 20e0558..ea9a1ef 100644 --- a/gsmartcontrol/src/hz/launch_url.h +++ b/gsmartcontrol/src/hz/launch_url.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/local_algo.h b/gsmartcontrol/src/hz/local_algo.h index 608d4c1..110e170 100644 --- a/gsmartcontrol/src/hz/local_algo.h +++ b/gsmartcontrol/src/hz/local_algo.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/locale_tools.h b/gsmartcontrol/src/hz/locale_tools.h index ab64f6b..34c268b 100644 --- a/gsmartcontrol/src/hz/locale_tools.h +++ b/gsmartcontrol/src/hz/locale_tools.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/noncopyable.h b/gsmartcontrol/src/hz/noncopyable.h index 88abd0a..2be8717 100644 --- a/gsmartcontrol/src/hz/noncopyable.h +++ b/gsmartcontrol/src/hz/noncopyable.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 1999 - 2008 Beman Dawes - (C) 2008 Alexander Shaduri + (C) 1999 - 2009 Beman Dawes + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/optional_value.h b/gsmartcontrol/src/hz/optional_value.h index 0f27a12..b9bc5e3 100644 --- a/gsmartcontrol/src/hz/optional_value.h +++ b/gsmartcontrol/src/hz/optional_value.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/process_signal.h b/gsmartcontrol/src/hz/process_signal.h index 6da60db..e4788f4 100644 --- a/gsmartcontrol/src/hz/process_signal.h +++ b/gsmartcontrol/src/hz/process_signal.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/ptr_container.h b/gsmartcontrol/src/hz/ptr_container.h index 90eacb8..0cbf54b 100644 --- a/gsmartcontrol/src/hz/ptr_container.h +++ b/gsmartcontrol/src/hz/ptr_container.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/res_data.h b/gsmartcontrol/src/hz/res_data.h index f410a1a..3af9a1b 100644 --- a/gsmartcontrol/src/hz/res_data.h +++ b/gsmartcontrol/src/hz/res_data.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/scoped_array.h b/gsmartcontrol/src/hz/scoped_array.h index df41cfc..eb31b57 100644 --- a/gsmartcontrol/src/hz/scoped_array.h +++ b/gsmartcontrol/src/hz/scoped_array.h @@ -1,8 +1,8 @@ /************************************************************************** Copyright: - (C) 1998 - 2008 Greg Colvin and Beman Dawes - (C) 2001 - 2008 Peter Dimov - (C) 2008 Alexander Shaduri + (C) 1998 - 2009 Greg Colvin and Beman Dawes + (C) 2001 - 2009 Peter Dimov + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/scoped_ptr.h b/gsmartcontrol/src/hz/scoped_ptr.h index 916d6e6..f3a532c 100644 --- a/gsmartcontrol/src/hz/scoped_ptr.h +++ b/gsmartcontrol/src/hz/scoped_ptr.h @@ -1,8 +1,8 @@ /************************************************************************** Copyright: - (C) 1998 - 2008 Greg Colvin and Beman Dawes - (C) 2001 - 2008 Peter Dimov - (C) 2008 Alexander Shaduri + (C) 1998 - 2009 Greg Colvin and Beman Dawes + (C) 2001 - 2009 Peter Dimov + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/static_assert.h b/gsmartcontrol/src/hz/static_assert.h index 324f9b7..72e0504 100644 --- a/gsmartcontrol/src/hz/static_assert.h +++ b/gsmartcontrol/src/hz/static_assert.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Alexander Shaduri + (C) 2003 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/stream_cast.h b/gsmartcontrol/src/hz/stream_cast.h index c04b399..f7ed4d9 100644 --- a/gsmartcontrol/src/hz/stream_cast.h +++ b/gsmartcontrol/src/hz/stream_cast.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2000 - 2008 Kevlin Henney - (C) 2008 Alexander Shaduri + (C) 2000 - 2009 Kevlin Henney + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_boost_1_0.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_algo.h b/gsmartcontrol/src/hz/string_algo.h index b42d5c1..c82026c 100644 --- a/gsmartcontrol/src/hz/string_algo.h +++ b/gsmartcontrol/src/hz/string_algo.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_algo_test.cpp b/gsmartcontrol/src/hz/string_algo_test.cpp index 8065c6d..79320ae 100644 --- a/gsmartcontrol/src/hz/string_algo_test.cpp +++ b/gsmartcontrol/src/hz/string_algo_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_format.h b/gsmartcontrol/src/hz/string_format.h index 7a62f68..6233633 100644 --- a/gsmartcontrol/src/hz/string_format.h +++ b/gsmartcontrol/src/hz/string_format.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_format_test.cpp b/gsmartcontrol/src/hz/string_format_test.cpp index be5be79..02405bb 100644 --- a/gsmartcontrol/src/hz/string_format_test.cpp +++ b/gsmartcontrol/src/hz/string_format_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_num.h b/gsmartcontrol/src/hz/string_num.h index b02d352..346d927 100644 --- a/gsmartcontrol/src/hz/string_num.h +++ b/gsmartcontrol/src/hz/string_num.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_num_test.cpp b/gsmartcontrol/src/hz/string_num_test.cpp index a1aea42..1322579 100644 --- a/gsmartcontrol/src/hz/string_num_test.cpp +++ b/gsmartcontrol/src/hz/string_num_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_sprintf.h b/gsmartcontrol/src/hz/string_sprintf.h index 9d3d59c..1854028 100644 --- a/gsmartcontrol/src/hz/string_sprintf.h +++ b/gsmartcontrol/src/hz/string_sprintf.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_wcmatch.h b/gsmartcontrol/src/hz/string_wcmatch.h index f244cf5..4de3211 100644 --- a/gsmartcontrol/src/hz/string_wcmatch.h +++ b/gsmartcontrol/src/hz/string_wcmatch.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: (C) 1989, 1993, 1994 The Regents of the University of California - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_bsd-ucb.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/string_wcmatch_test.cpp b/gsmartcontrol/src/hz/string_wcmatch_test.cpp index dec8582..246dda8 100644 --- a/gsmartcontrol/src/hz/string_wcmatch_test.cpp +++ b/gsmartcontrol/src/hz/string_wcmatch_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync.h b/gsmartcontrol/src/hz/sync.h index 47f9405..7553ff0 100644 --- a/gsmartcontrol/src/hz/sync.h +++ b/gsmartcontrol/src/hz/sync.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_lock_ptr.h b/gsmartcontrol/src/hz/sync_lock_ptr.h index 2d16156..bcdca22 100644 --- a/gsmartcontrol/src/hz/sync_lock_ptr.h +++ b/gsmartcontrol/src/hz/sync_lock_ptr.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_multilock.h b/gsmartcontrol/src/hz/sync_multilock.h index e7e33c8..9dc271c 100644 --- a/gsmartcontrol/src/hz/sync_multilock.h +++ b/gsmartcontrol/src/hz/sync_multilock.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_multilock_test.cpp b/gsmartcontrol/src/hz/sync_multilock_test.cpp index afabda4..6eb759c 100644 --- a/gsmartcontrol/src/hz/sync_multilock_test.cpp +++ b/gsmartcontrol/src/hz/sync_multilock_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_part_get_policy.h b/gsmartcontrol/src/hz/sync_part_get_policy.h index 66b86ca..ad484b5 100644 --- a/gsmartcontrol/src/hz/sync_part_get_policy.h +++ b/gsmartcontrol/src/hz/sync_part_get_policy.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_policy_boost.h b/gsmartcontrol/src/hz/sync_policy_boost.h index a4e5e1c..b207774 100644 --- a/gsmartcontrol/src/hz/sync_policy_boost.h +++ b/gsmartcontrol/src/hz/sync_policy_boost.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_policy_glib.h b/gsmartcontrol/src/hz/sync_policy_glib.h index 9126480..5f5c8e1 100644 --- a/gsmartcontrol/src/hz/sync_policy_glib.h +++ b/gsmartcontrol/src/hz/sync_policy_glib.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_policy_glibmm.h b/gsmartcontrol/src/hz/sync_policy_glibmm.h index f527dfd..4d58e76 100644 --- a/gsmartcontrol/src/hz/sync_policy_glibmm.h +++ b/gsmartcontrol/src/hz/sync_policy_glibmm.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_policy_poco.h b/gsmartcontrol/src/hz/sync_policy_poco.h index 07a4669..c1e3bab 100644 --- a/gsmartcontrol/src/hz/sync_policy_poco.h +++ b/gsmartcontrol/src/hz/sync_policy_poco.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_policy_pthread.h b/gsmartcontrol/src/hz/sync_policy_pthread.h index 9c5abb5..458ac36 100644 --- a/gsmartcontrol/src/hz/sync_policy_pthread.h +++ b/gsmartcontrol/src/hz/sync_policy_pthread.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_policy_win32.h b/gsmartcontrol/src/hz/sync_policy_win32.h index 7af2f5e..f0f81db 100644 --- a/gsmartcontrol/src/hz/sync_policy_win32.h +++ b/gsmartcontrol/src/hz/sync_policy_win32.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/sync_test.cpp b/gsmartcontrol/src/hz/sync_test.cpp index 7d4a8d5..e82a400 100644 --- a/gsmartcontrol/src/hz/sync_test.cpp +++ b/gsmartcontrol/src/hz/sync_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/system_specific.h b/gsmartcontrol/src/hz/system_specific.h index baafa88..4146acc 100644 --- a/gsmartcontrol/src/hz/system_specific.h +++ b/gsmartcontrol/src/hz/system_specific.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/tls.h b/gsmartcontrol/src/hz/tls.h index ff1f6d7..c33e769 100644 --- a/gsmartcontrol/src/hz/tls.h +++ b/gsmartcontrol/src/hz/tls.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/tls_policy_boost.h b/gsmartcontrol/src/hz/tls_policy_boost.h index 68644fe..71024aa 100644 --- a/gsmartcontrol/src/hz/tls_policy_boost.h +++ b/gsmartcontrol/src/hz/tls_policy_boost.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/tls_policy_glib.h b/gsmartcontrol/src/hz/tls_policy_glib.h index a65b61d..05ed3ea 100644 --- a/gsmartcontrol/src/hz/tls_policy_glib.h +++ b/gsmartcontrol/src/hz/tls_policy_glib.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/tls_policy_pthread.h b/gsmartcontrol/src/hz/tls_policy_pthread.h index be4ad74..fd35cd4 100644 --- a/gsmartcontrol/src/hz/tls_policy_pthread.h +++ b/gsmartcontrol/src/hz/tls_policy_pthread.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/tls_policy_win32.h b/gsmartcontrol/src/hz/tls_policy_win32.h index 1e8a88b..9cf553e 100644 --- a/gsmartcontrol/src/hz/tls_policy_win32.h +++ b/gsmartcontrol/src/hz/tls_policy_win32.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/tls_test.cpp b/gsmartcontrol/src/hz/tls_test.cpp index 2a3e4f6..427f7c2 100644 --- a/gsmartcontrol/src/hz/tls_test.cpp +++ b/gsmartcontrol/src/hz/tls_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/type_categories.h b/gsmartcontrol/src/hz/type_categories.h index cac9c02..5cccd17 100644 --- a/gsmartcontrol/src/hz/type_categories.h +++ b/gsmartcontrol/src/hz/type_categories.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Alexander Shaduri + (C) 2003 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/hz/win32_tools.h b/gsmartcontrol/src/hz/win32_tools.h index 628b9ed..929430a 100644 --- a/gsmartcontrol/src/hz/win32_tools.h +++ b/gsmartcontrol/src/hz/win32_tools.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Alexander Shaduri + (C) 2003 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ @@ -71,7 +71,7 @@ inline bool win32_get_registry_value_string(std::string& put_here, HKEY base, if (status) { char* result = new char[nbytes + 1]; - status = RegQueryValueEx(reg_key, key.c_str(), 0, &type, (BYTE*)result, &nbytes); + status = (RegQueryValueEx(reg_key, key.c_str(), 0, &type, (BYTE*)result, &nbytes) == ERROR_SUCCESS); result[nbytes] = '\0'; put_here = result; delete[] result; diff --git a/gsmartcontrol/src/libdebug/dchannel.cpp b/gsmartcontrol/src/libdebug/dchannel.cpp index 5c1ad5a..f2ca0a8 100644 --- a/gsmartcontrol/src/libdebug/dchannel.cpp +++ b/gsmartcontrol/src/libdebug/dchannel.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dchannel.h b/gsmartcontrol/src/libdebug/dchannel.h index 5aff641..122c2be 100644 --- a/gsmartcontrol/src/libdebug/dchannel.h +++ b/gsmartcontrol/src/libdebug/dchannel.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dcmdarg.cpp b/gsmartcontrol/src/libdebug/dcmdarg.cpp index 258463d..d7e59fa 100644 --- a/gsmartcontrol/src/libdebug/dcmdarg.cpp +++ b/gsmartcontrol/src/libdebug/dcmdarg.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ @@ -188,7 +188,7 @@ GOptionGroup* debug_get_option_group() debug_internal::DebugCmdArgs* args = debug_internal::debug_get_args_holder(); GOptionGroup* group = g_option_group_new("debug", - "LibDebug Logging options", "Show LibDebug Options", + "Libdebug Logging Options", "Show libdebug options", args, NULL); static const GOptionEntry entries[] = diff --git a/gsmartcontrol/src/libdebug/dcmdarg.h b/gsmartcontrol/src/libdebug/dcmdarg.h index 4675125..49a2c4e 100644 --- a/gsmartcontrol/src/libdebug/dcmdarg.h +++ b/gsmartcontrol/src/libdebug/dcmdarg.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dexcept.h b/gsmartcontrol/src/libdebug/dexcept.h index c00005a..929e6ef 100644 --- a/gsmartcontrol/src/libdebug/dexcept.h +++ b/gsmartcontrol/src/libdebug/dexcept.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dflags.cpp b/gsmartcontrol/src/libdebug/dflags.cpp index e497d8a..d841d59 100644 --- a/gsmartcontrol/src/libdebug/dflags.cpp +++ b/gsmartcontrol/src/libdebug/dflags.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dflags.h b/gsmartcontrol/src/libdebug/dflags.h index ca0b94a..bbf73a5 100644 --- a/gsmartcontrol/src/libdebug/dflags.h +++ b/gsmartcontrol/src/libdebug/dflags.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dout.cpp b/gsmartcontrol/src/libdebug/dout.cpp index 659a796..3af9436 100644 --- a/gsmartcontrol/src/libdebug/dout.cpp +++ b/gsmartcontrol/src/libdebug/dout.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dout.h b/gsmartcontrol/src/libdebug/dout.h index a3f163b..5741957 100644 --- a/gsmartcontrol/src/libdebug/dout.h +++ b/gsmartcontrol/src/libdebug/dout.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dstate.cpp b/gsmartcontrol/src/libdebug/dstate.cpp index 4a09056..e162d7a 100644 --- a/gsmartcontrol/src/libdebug/dstate.cpp +++ b/gsmartcontrol/src/libdebug/dstate.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dstate.h b/gsmartcontrol/src/libdebug/dstate.h index ea0b2b6..213fe4d 100644 --- a/gsmartcontrol/src/libdebug/dstate.h +++ b/gsmartcontrol/src/libdebug/dstate.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dstate_pub.h b/gsmartcontrol/src/libdebug/dstate_pub.h index e9447a1..54924b1 100644 --- a/gsmartcontrol/src/libdebug/dstate_pub.h +++ b/gsmartcontrol/src/libdebug/dstate_pub.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dstream.cpp b/gsmartcontrol/src/libdebug/dstream.cpp index 5a72af5..96fb2bf 100644 --- a/gsmartcontrol/src/libdebug/dstream.cpp +++ b/gsmartcontrol/src/libdebug/dstream.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/dstream.h b/gsmartcontrol/src/libdebug/dstream.h index c98882d..fe2d591 100644 --- a/gsmartcontrol/src/libdebug/dstream.h +++ b/gsmartcontrol/src/libdebug/dstream.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/libdebug.h b/gsmartcontrol/src/libdebug/libdebug.h index 4979fde..2a77d2d 100644 --- a/gsmartcontrol/src/libdebug/libdebug.h +++ b/gsmartcontrol/src/libdebug/libdebug.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/libdebug_mini.h b/gsmartcontrol/src/libdebug/libdebug_mini.h index 5ec8dac..88ced15 100644 --- a/gsmartcontrol/src/libdebug/libdebug_mini.h +++ b/gsmartcontrol/src/libdebug/libdebug_mini.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/libdebug/libdebug_test.cpp b/gsmartcontrol/src/libdebug/libdebug_test.cpp index 41c947d..dd35fca 100644 --- a/gsmartcontrol/src/libdebug/libdebug_test.cpp +++ b/gsmartcontrol/src/libdebug/libdebug_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rcautosave.h b/gsmartcontrol/src/rconfig/rcautosave.h index cc938de..6c18004 100644 --- a/gsmartcontrol/src/rconfig/rcautosave.h +++ b/gsmartcontrol/src/rconfig/rcautosave.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rcdump.h b/gsmartcontrol/src/rconfig/rcdump.h index 54c13d9..f2c06a7 100644 --- a/gsmartcontrol/src/rconfig/rcdump.h +++ b/gsmartcontrol/src/rconfig/rcdump.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rcloadsave.h b/gsmartcontrol/src/rconfig/rcloadsave.h index 229aedc..4112a52 100644 --- a/gsmartcontrol/src/rconfig/rcloadsave.h +++ b/gsmartcontrol/src/rconfig/rcloadsave.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rcmain.h b/gsmartcontrol/src/rconfig/rcmain.h index 5a902df..f1b1b70 100644 --- a/gsmartcontrol/src/rconfig/rcmain.h +++ b/gsmartcontrol/src/rconfig/rcmain.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rconfig.h b/gsmartcontrol/src/rconfig/rconfig.h index 218ae9f..4ea84df 100644 --- a/gsmartcontrol/src/rconfig/rconfig.h +++ b/gsmartcontrol/src/rconfig/rconfig.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rconfig_mini.h b/gsmartcontrol/src/rconfig/rconfig_mini.h index 1731a92..e037f4b 100644 --- a/gsmartcontrol/src/rconfig/rconfig_mini.h +++ b/gsmartcontrol/src/rconfig/rconfig_mini.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_zlib.txt file ***************************************************************************/ diff --git a/gsmartcontrol/src/rconfig/rconfig_test.cpp b/gsmartcontrol/src/rconfig/rconfig_test.cpp index eea3f36..a3dd924 100644 --- a/gsmartcontrol/src/rconfig/rconfig_test.cpp +++ b/gsmartcontrol/src/rconfig/rconfig_test.cpp @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/ diff --git a/gsmartcontrol/src/res/gsc_info_window.glade b/gsmartcontrol/src/res/gsc_info_window.glade index 8bd8f67..e769608 100644 --- a/gsmartcontrol/src/res/gsc_info_window.glade +++ b/gsmartcontrol/src/res/gsc_info_window.glade @@ -1,6 +1,6 @@ - + 5 @@ -109,77 +109,6 @@ False - - - True - - - True - - - 1 - True - - - - - 1 - True - 0 - True - - - False - 1 - - - - - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - True - GTK_TREE_VIEW_GRID_LINES_BOTH - - - - - 1 - - - - - 1 - True - - - - - True - True - Drive capabilities - Drive capabilities - Ca_pabilities - True - True - - - tab - 1 - False - - True @@ -245,7 +174,7 @@ - 2 + 1 @@ -258,6 +187,77 @@ True True + + tab + 1 + False + + + + + True + + + True + + + 1 + True + + + + + 1 + True + 0 + True + + + False + 1 + + + + + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + GTK_TREE_VIEW_GRID_LINES_BOTH + + + + + 1 + + + + + 2 + True + + + + + True + True + Drive capabilities + Drive capabilities + Ca_pabilities + True + True + tab 2 @@ -563,119 +563,6 @@ Selective self-test log is also presented here. 2 8 10 - - - 5 - - - True - gtk-dialog-info - 5 - - - False - - - - - True - 0 - Test result text - True - 70 - - - 1 - - - - - 2 - 3 - 4 - 20 - - - - - True - Test progress - Test progress - True - Test completion: 90%; ETA: 12 minutes - PANGO_ELLIPSIZE_END - - - 2 - 3 - 10 - - - - - True - True - True - Abort the test - Abort the test - gtk-stop - True - 0 - - - 1 - 2 - 2 - 3 - GTK_FILL - 10 - - - - - 85 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - Test description - Test description - False - GTK_WRAP_WORD - 5 - 5 - False - - - - - 2 - 1 - 2 - - - - - True - True - True - Perform selected test - Perform selected test - gtk-execute - True - 0 - - - 1 - 2 - GTK_FILL - - True @@ -749,6 +636,119 @@ Conveyance + + + True + True + True + Perform selected test + Perform selected test + gtk-execute + True + 0 + + + 1 + 2 + GTK_FILL + + + + + 85 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + Test description + Test description + False + GTK_WRAP_WORD + 5 + 5 + False + + + + + 2 + 1 + 2 + + + + + True + True + True + Abort the test + Abort the test + gtk-stop + True + 0 + + + 1 + 2 + 2 + 3 + GTK_FILL + 10 + + + + + True + Test progress + Test progress + True + Test completion: 90%; ETA: 12 minutes + PANGO_ELLIPSIZE_END + + + 2 + 3 + 10 + + + + + 5 + + + True + gtk-dialog-info + 5 + + + False + + + + + True + 0 + Test result text + True + 70 + + + 1 + + + + + 2 + 3 + 4 + 20 + + 1 @@ -803,8 +803,8 @@ Conveyance gtk-refresh True 0 - + diff --git a/gsmartcontrol/src/rmn/resource_base.h b/gsmartcontrol/src/rmn/resource_base.h index 625e794..afc5a92 100644 --- a/gsmartcontrol/src/rmn/resource_base.h +++ b/gsmartcontrol/src/rmn/resource_base.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Irakli Elizbarashvili - (C) 2008 Alexander Shaduri + (C) 2003 - 2009 Irakli Elizbarashvili + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_data_any.h b/gsmartcontrol/src/rmn/resource_data_any.h index 34545ab..ac2e762 100644 --- a/gsmartcontrol/src/rmn/resource_data_any.h +++ b/gsmartcontrol/src/rmn/resource_data_any.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_data_locking.h b/gsmartcontrol/src/rmn/resource_data_locking.h index d61de1f..139f262 100644 --- a/gsmartcontrol/src/rmn/resource_data_locking.h +++ b/gsmartcontrol/src/rmn/resource_data_locking.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_data_one.h b/gsmartcontrol/src/rmn/resource_data_one.h index c76b3eb..098ee43 100644 --- a/gsmartcontrol/src/rmn/resource_data_one.h +++ b/gsmartcontrol/src/rmn/resource_data_one.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_data_types.h b/gsmartcontrol/src/rmn/resource_data_types.h index 19b8540..9de4586 100644 --- a/gsmartcontrol/src/rmn/resource_data_types.h +++ b/gsmartcontrol/src/rmn/resource_data_types.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_exception.h b/gsmartcontrol/src/rmn/resource_exception.h index 4d10492..87e6efe 100644 --- a/gsmartcontrol/src/rmn/resource_exception.h +++ b/gsmartcontrol/src/rmn/resource_exception.h @@ -1,6 +1,6 @@ /************************************************************************** Copyright: - (C) 2008 Alexander Shaduri + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_node.h b/gsmartcontrol/src/rmn/resource_node.h index 2ec83f2..792fcc5 100644 --- a/gsmartcontrol/src/rmn/resource_node.h +++ b/gsmartcontrol/src/rmn/resource_node.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Irakli Elizbarashvili - (C) 2008 Alexander Shaduri + (C) 2003 - 2009 Irakli Elizbarashvili + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_node_dump.h b/gsmartcontrol/src/rmn/resource_node_dump.h index 183d10d..57eb117 100644 --- a/gsmartcontrol/src/rmn/resource_node_dump.h +++ b/gsmartcontrol/src/rmn/resource_node_dump.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Irakli Elizbarashvili - (C) 2008 Alexander Shaduri + (C) 2003 - 2009 Irakli Elizbarashvili + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/resource_serialization.h b/gsmartcontrol/src/rmn/resource_serialization.h index cb10e0e..3f4cbba 100644 --- a/gsmartcontrol/src/rmn/resource_serialization.h +++ b/gsmartcontrol/src/rmn/resource_serialization.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Irakli Elizbarashvili - (C) 2008 Alexander Shaduri + (C) 2003 - 2009 Irakli Elizbarashvili + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/rmn.h b/gsmartcontrol/src/rmn/rmn.h index 6afaa67..19366b6 100644 --- a/gsmartcontrol/src/rmn/rmn.h +++ b/gsmartcontrol/src/rmn/rmn.h @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Irakli Elizbarashvili - (C) 2008 Alexander Shaduri + (C) 2003 - 2009 Irakli Elizbarashvili + (C) 2008 - 2009 Alexander Shaduri License: diff --git a/gsmartcontrol/src/rmn/rmn_test.cpp b/gsmartcontrol/src/rmn/rmn_test.cpp index 3322d47..b37b5b6 100644 --- a/gsmartcontrol/src/rmn/rmn_test.cpp +++ b/gsmartcontrol/src/rmn/rmn_test.cpp @@ -1,7 +1,7 @@ /************************************************************************** Copyright: - (C) 2003 - 2008 Irakli Elizbarashvili - (C) 2008 Alexander Shaduri + (C) 2003 - 2009 Irakli Elizbarashvili + (C) 2008 - 2009 Alexander Shaduri License: See LICENSE_whatever.txt ***************************************************************************/