From ff2a6c00dd0790257f5d044b2e53dc5b60dc5f17 Mon Sep 17 00:00:00 2001 From: Curtis Gedak Date: Mon, 7 Apr 2008 20:10:28 +0000 Subject: [PATCH] Changes post gparted-0.3.6 - code recreation from Source Forge svn path=/trunk/; revision=811 --- ChangeLog | 29 ++++++++++++++++++++++++++- Makefile.am | 5 ----- autogen.sh | 7 +------ configure.in | 17 ++++++++-------- po/LINGUAS | 45 ++++++++++++++++++++++++++++++++++++++++++ src/TreeView_Detail.cc | 7 ++----- src/Utils.cc | 13 +++++------- src/reiser4.cc | 2 +- src/reiserfs.cc | 2 +- 9 files changed, 92 insertions(+), 35 deletions(-) create mode 100644 po/LINGUAS diff --git a/ChangeLog b/ChangeLog index 971e6e7e..e6c9324e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,34 @@ 2008-04-07 Marcel Telka * MAINTAINERS: New file (bug #524276). - * configure.in: Added 'sk' to ALL_LINGUAS. + +2008-04-03 Curtis Gedak + + * configure.in, + autogen.sh, + po/LINGUAS: Enhanced to use po/LINGUAS for LINGUAS + - Closes GParted bug #467459 + - Thanks to Christian Persch for this patch + +2008-04-01 Curtis Gedak + + * Makefile.am: Removed distclean target enhancements from 2008-02-05 + - use "make dist" to create a distribution archive file + +2008-03-31 Curtis Gedak + + * src/Utils.cc: Ensure hour portion of time is always displayed + - Closes GParted bug #438590 + + * src/TreeView_Detail.cc: Removed text_color hard coding + - Removed hard coding of Partition and Filesystem text_color + which was based on if partition was TYPE_UNALLOCATED. + - Removed hard coding of Mount text_color which was based + on if partition was busy. Lock symbol provides this indicator. + - Closes GParted bug #413810 + + * src/reiser4.cc, + src/reiserfs.cc: Tighten get_label regular expression 2008-03-26 Curtis Gedak diff --git a/Makefile.am b/Makefile.am index 6a0df9a4..92dafd94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,3 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update \ $(desktop_DATA) - -distclean-local: - rm -rf autom4te.cache - find . -name .svn | xargs rm -rf - find . -name .cvsignore | xargs rm -rf diff --git a/autogen.sh b/autogen.sh index 726e4f72..c54a0eb4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,15 +5,10 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="gparted" -REQUIRED_AUTOMAKE_VERSION=1.7 which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME CVS" exit 1 } -#i needed to put this one here on order to fix an weird depcomp error -aclocal - - -USE_GNOME2_MACROS=1 . gnome-autogen.sh +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh \ No newline at end of file diff --git a/configure.in b/configure.in index fd26fdff..bdef4338 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,9 @@ -AC_INIT(gparted, 0.3.6) -AC_CONFIG_SRCDIR(src/main.cc) -AM_INIT_AUTOMAKE +AC_INIT([gparted],[0.3.7-svn],[http://bugzilla.gnome.org/simple-bug-guide.cgi?product=gparted]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_SRCDIR(src/main.cc) +AC_CONFIG_HEADERS([config.h]) + +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) AM_MAINTAINER_MODE @@ -20,10 +21,8 @@ GETTEXT_PACKAGE=gparted AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[description]) -ALL_LINGUAS="ar bg ca cs de dz el en_CA en_GB es eu fi fr gl he hu it ja ko lt lv mk nb ne nl oc pa pl pt pt_BR ru rw si sk sl sv th tr uk vi zh_CN zh_HK zh_TW" - AM_GLIB_GNU_GETTEXT -AC_PROG_INTLTOOL +IT_PROG_INTLTOOL([0.35.5]) dnl====================== @@ -74,7 +73,7 @@ AC_SUBST(GTKMM_LIBS) AC_SUBST(GTKMM_CFLAGS) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile compose/Makefile include/Makefile @@ -82,3 +81,5 @@ src/Makefile pixmaps/Makefile po/Makefile.in ]) + +AC_OUTPUT \ No newline at end of file diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 00000000..d10d4f5b --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,45 @@ +# please keep this list sorted alphabetically +# +ar +bg +ca +cs +de +dz +el +en_CA +en_GB +es +eu +fi +fr +gl +he +hu +it +ja +ko +lt +lv +mk +nb +ne +nl +oc +pa +pl +pt +pt_BR +ru +rw +si +sk +sl +sv +th +tr +uk +vi +zh_CN +zh_HK +zh_TW diff --git a/src/TreeView_Detail.cc b/src/TreeView_Detail.cc index b5b2ec04..09f32c25 100644 --- a/src/TreeView_Detail.cc +++ b/src/TreeView_Detail.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Bart +/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -176,16 +176,13 @@ void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition treerow[ treeview_detail_columns .color ] = Utils::get_color_as_pixbuf( partition .filesystem, 16, 16 ) ; - treerow[ treeview_detail_columns .text_color ] = - partition .type == GParted::TYPE_UNALLOCATED ? "darkgrey" : "black" ; - treerow[ treeview_detail_columns .filesystem ] = Utils::get_filesystem_string( partition .filesystem ) ; //mountpoint - treerow[ treeview_detail_columns .mount_text_color ] = partition .busy ? "black" : "darkgrey" ; treerow[ treeview_detail_columns .mountpoint ] = Glib::build_path( ", ", partition .get_mountpoints() ) ; + //label treerow[ treeview_detail_columns .label ] = partition .label ; //size diff --git a/src/Utils.cc b/src/Utils.cc index e604c13e..21ab5b99 100644 --- a/src/Utils.cc +++ b/src/Utils.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Bart 'plors' Hakvoort +/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -170,13 +170,10 @@ Glib::ustring Utils::format_time( std::time_t seconds ) Glib::ustring time ; int unit = static_cast( seconds / 3600 ) ; - if ( unit > 0 ) - { - if ( unit < 10 ) - time += "0" ; - time += num_to_str( unit ) + ":" ; - seconds %= 3600 ; - } + if ( unit < 10 ) + time += "0" ; + time += num_to_str( unit ) + ":" ; + seconds %= 3600 ; unit = static_cast( seconds / 60 ) ; if ( unit < 10 ) diff --git a/src/reiser4.cc b/src/reiser4.cc index c5696f1e..1eac3096 100644 --- a/src/reiser4.cc +++ b/src/reiser4.cc @@ -84,7 +84,7 @@ void reiser4::get_label( Partition & partition ) { if ( ! Utils::execute_command( "debugfs.reiser4 " + partition .get_path(), output, error, true ) ) { - Glib::ustring label = Utils::regexp_label( output, "^label:[\t ]*([^!]*)" ) ; + Glib::ustring label = Utils::regexp_label( output, "^label:[\t ]*([^!]*)$" ) ; //FIXME: find a better way to see if label is empty.. imagine someone uses '' as label.... ;) if( label != "" ) partition .label = label ; diff --git a/src/reiserfs.cc b/src/reiserfs.cc index 247548a5..a36e5680 100644 --- a/src/reiserfs.cc +++ b/src/reiserfs.cc @@ -93,7 +93,7 @@ void reiserfs::get_label( Partition & partition ) //FIXME: i think running debugreiserfs takes a long time on filled filesystems, test for this... if ( ! Utils::execute_command( "debugreiserfs " + partition .get_path(), output, error, true ) ) { - partition .label = Utils::regexp_label( output, "^label:[\t ]*(.*)" ) ; + partition .label = Utils::regexp_label( output, "^label:[\t ]*(.*)$" ) ; } else {