From 17e088553d8a955f6e0f6d5d88111ad16e7b2ac2 Mon Sep 17 00:00:00 2001 From: Bart Hakvoort Date: Wed, 5 Apr 2006 09:33:04 +0000 Subject: [PATCH] disabled resizing of this dialog renamed 'Filesystems' to 'Features' in * src/DialogManageFlags.cc: disabled resizing of this dialog * include/DialogFeatures.h, include/Makefile.am, include/Win_GParted.h, src/DialogFeatures.cc, src/Makefile.am, src/Win_GParted.cc: renamed 'Filesystems' to 'Features' in the featuredialog to better reflect the actual functionality * include/Dialog_Filesystems.h, src/Dialog_Filesystems.cc: removed --- ChangeLog | 13 +++++++++++++ ...{Dialog_Filesystems.h => DialogFeatures.h} | 19 ++++++++++--------- include/Makefile.am | 4 ++-- include/Win_GParted.h | 2 +- po/POTFILES.in | 2 +- ...ialog_Filesystems.cc => DialogFeatures.cc} | 16 ++++++++-------- src/DialogManageFlags.cc | 3 ++- src/Makefile.am | 4 ++-- src/Win_GParted.cc | 14 +++++++------- 9 files changed, 46 insertions(+), 31 deletions(-) rename include/{Dialog_Filesystems.h => DialogFeatures.h} (86%) rename src/{Dialog_Filesystems.cc => DialogFeatures.cc} (89%) diff --git a/ChangeLog b/ChangeLog index 607c3d25..0fabe307 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-04-05 Bart Hakvoort + + * src/DialogManageFlags.cc: disabled resizing of this dialog + * include/DialogFeatures.h, + include/Makefile.am, + include/Win_GParted.h, + src/DialogFeatures.cc, + src/Makefile.am, + src/Win_GParted.cc: renamed 'Filesystems' to 'Features' in the + featuredialog to better reflect the actual functionality + * include/Dialog_Filesystems.h, + src/Dialog_Filesystems.cc: removed + 2006-04-04 Bart Hakvoort * configure.in: bumped to gparted-0.2.4 diff --git a/include/Dialog_Filesystems.h b/include/DialogFeatures.h similarity index 86% rename from include/Dialog_Filesystems.h rename to include/DialogFeatures.h index e9a97255..d05c4e7f 100644 --- a/include/Dialog_Filesystems.h +++ b/include/DialogFeatures.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Bart +/* Copyright (C) 2004-2006 Bart 'plors' 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 @@ -15,8 +15,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef DIALOG_FILESYSTEMS -#define DIALOG_FILESYSTEMS +#ifndef DIALOG_FEATURES +#define DIALOG_FEATURES #include "../include/Utils.h" @@ -27,15 +27,16 @@ namespace GParted { -class Dialog_Filesystems : public Gtk::Dialog +class DialogFeatures : public Gtk::Dialog { public: - Dialog_Filesystems() ; - void Load_Filesystems( const std::vector & FILESYSTEMS ) ; - ~Dialog_Filesystems() ; + DialogFeatures() ; + ~DialogFeatures() ; + + void load_filesystems( const std::vector & FILESYSTEMS ) ; private: - void Show_Filesystem( const FS & fs ) ; + void show_filesystem( const FS & fs ) ; Gtk::TreeView treeview_filesystems; Gtk::TreeRow treerow; @@ -74,4 +75,4 @@ private: } //GParted -#endif //DIALOG_FILESYSTEMS +#endif //DIALOG_FEATURES diff --git a/include/Makefile.am b/include/Makefile.am index 82810e22..31c97ac1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -4,12 +4,12 @@ EXTRA_DIST = \ Device.h \ Dialog_Base_Partition.h \ Dialog_Disklabel.h \ - Dialog_Filesystems.h \ Dialog_Partition_Copy.h \ Dialog_Partition_Info.h \ Dialog_Partition_New.h \ Dialog_Partition_Resize_Move.h \ Dialog_Progress.h \ + DialogFeatures.h \ DialogManageFlags.h \ DrawingAreaVisualDisk.h \ FileSystem.h \ @@ -38,5 +38,5 @@ EXTRA_DIST = \ ntfs.h \ reiser4.h \ reiserfs.h \ - ufs.h \ + ufs.h \ xfs.h diff --git a/include/Win_GParted.h b/include/Win_GParted.h index d5c254c6..782605e2 100644 --- a/include/Win_GParted.h +++ b/include/Win_GParted.h @@ -127,7 +127,7 @@ private: void on_show() ; void menu_gparted_refresh_devices(); - void menu_gparted_filesystems(); + void menu_gparted_features(); void menu_gparted_quit(); void menu_view_harddisk_info(); void menu_view_operations(); diff --git a/po/POTFILES.in b/po/POTFILES.in index 497eedb8..6a159bbb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,12 +3,12 @@ gparted.desktop.in src/Dialog_Base_Partition.cc src/Dialog_Disklabel.cc -src/Dialog_Filesystems.cc src/Dialog_Partition_Copy.cc src/Dialog_Partition_Info.cc src/Dialog_Partition_New.cc src/Dialog_Partition_Resize_Move.cc src/Dialog_Progress.cc +src/DialogFeatures.cc src/DialogManageFlags.cc src/GParted_Core.cc src/OperationCopy.cc diff --git a/src/Dialog_Filesystems.cc b/src/DialogFeatures.cc similarity index 89% rename from src/Dialog_Filesystems.cc rename to src/DialogFeatures.cc index 40aaa44f..098ab424 100644 --- a/src/Dialog_Filesystems.cc +++ b/src/DialogFeatures.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Bart +/* Copyright (C) 2004-2006 Bart 'plors' 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 @@ -15,16 +15,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../include/Dialog_Filesystems.h" +#include "../include/DialogFeatures.h" #include namespace GParted { -Dialog_Filesystems::Dialog_Filesystems() +DialogFeatures::DialogFeatures() { - set_title( _("Filesystems") ) ; + set_title( _("Features") ) ; set_has_separator( false ) ; set_resizable( false ) ; @@ -52,15 +52,15 @@ Dialog_Filesystems::Dialog_Filesystems() show_all_children() ; } -void Dialog_Filesystems::Load_Filesystems( const std::vector & FILESYSTEMS ) +void DialogFeatures::load_filesystems( const std::vector & FILESYSTEMS ) { liststore_filesystems ->clear() ; for ( unsigned short t = 0; t < FILESYSTEMS .size() -1 ; t++ ) - Show_Filesystem( FILESYSTEMS[ t ] ) ; + show_filesystem( FILESYSTEMS[ t ] ) ; } -void Dialog_Filesystems::Show_Filesystem( const FS & fs ) +void DialogFeatures::show_filesystem( const FS & fs ) { treerow = *( liststore_filesystems ->append() ); treerow[ treeview_filesystems_columns .filesystem ] = Utils::get_filesystem_string( fs .filesystem ) ; @@ -75,7 +75,7 @@ void Dialog_Filesystems::Show_Filesystem( const FS & fs ) treerow[ treeview_filesystems_columns .check ] = fs .check ? icon_yes : icon_no ; } -Dialog_Filesystems::~Dialog_Filesystems() +DialogFeatures::~DialogFeatures() { } diff --git a/src/DialogManageFlags.cc b/src/DialogManageFlags.cc index ad579123..8cb12840 100644 --- a/src/DialogManageFlags.cc +++ b/src/DialogManageFlags.cc @@ -30,7 +30,7 @@ DialogManageFlags::DialogManageFlags( const Partition & partition, std::map" ; str_temp += String::ucompose( _("Manage flags on %1"), partition .get_path() ) ; @@ -49,6 +49,7 @@ DialogManageFlags::DialogManageFlags( const Partition & partition, std::map( treeview_flags .get_column_cell_renderer( 0 ) ) ->signal_toggled() .connect( sigc::mem_fun( *this, &DialogManageFlags::on_flag_toggled ) ) ; + treeview_flags .set_size_request( 300, -1 ) ; get_vbox() ->pack_start( treeview_flags, Gtk::PACK_SHRINK ) ; this ->partition = partition ; diff --git a/src/Makefile.am b/src/Makefile.am index a6855095..46e3164d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,12 +13,12 @@ gparted_SOURCES = \ Device.cc \ Dialog_Base_Partition.cc \ Dialog_Disklabel.cc \ - Dialog_Filesystems.cc \ Dialog_Partition_Copy.cc \ Dialog_Partition_Info.cc \ Dialog_Partition_New.cc \ Dialog_Partition_Resize_Move.cc \ Dialog_Progress.cc \ + DialogFeatures.cc \ DialogManageFlags.cc \ DrawingAreaVisualDisk.cc \ FileSystem.cc \ @@ -47,7 +47,7 @@ gparted_SOURCES = \ ntfs.cc \ reiser4.cc \ reiserfs.cc \ - ufs.cc \ + ufs.cc \ xfs.cc gparted_LDFLAGS = -lparted -lgthread-2.0 diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc index 7cc4c79d..7a05a89f 100644 --- a/src/Win_GParted.cc +++ b/src/Win_GParted.cc @@ -17,7 +17,7 @@ #include "../include/Win_GParted.h" #include "../include/Dialog_Progress.h" -#include "../include/Dialog_Filesystems.h" +#include "../include/DialogFeatures.h" #include "../include/Dialog_Disklabel.h" #include "../include/Dialog_Partition_Resize_Move.h" #include "../include/Dialog_Partition_Copy.h" @@ -118,7 +118,7 @@ void Win_GParted::init_menubar() menu ->items() .push_back( Gtk::Menu_Helpers::ImageMenuElem( _("Devices"), *image ) ) ; menu ->items() .push_back( Gtk::Menu_Helpers::SeparatorElem( ) ); - menu ->items() .push_back( Gtk::Menu_Helpers::MenuElem( _("Filesystems"), sigc::mem_fun( *this, &Win_GParted::menu_gparted_filesystems ) ) ); + menu ->items() .push_back( Gtk::Menu_Helpers::MenuElem( _("Features"), sigc::mem_fun( *this, &Win_GParted::menu_gparted_features ) ) ); menu ->items() .push_back( Gtk::Menu_Helpers::SeparatorElem( ) ); menu ->items() .push_back( Gtk::Menu_Helpers::StockMenuElem( Gtk::Stock::QUIT, sigc::mem_fun(*this, &Win_GParted::menu_gparted_quit) ) ); menubar_main .items() .push_back( Gtk::Menu_Helpers::MenuElem( _("_GParted"), *menu ) ); @@ -130,7 +130,7 @@ void Win_GParted::init_menubar() menubar_main .items() .push_back( Gtk::Menu_Helpers::MenuElem( _("_Edit"), *menu ) ); //view - menu = manage( new Gtk::Menu( ) ) ; + menu = manage( new Gtk::Menu() ) ; menu ->items() .push_back( Gtk::Menu_Helpers::CheckMenuElem( _("Harddisk Information"), sigc::mem_fun(*this, &Win_GParted::menu_view_harddisk_info) ) ); menu ->items() .push_back( Gtk::Menu_Helpers::CheckMenuElem( _("Operations"), sigc::mem_fun(*this, &Win_GParted::menu_view_operations) ) ); menubar_main .items() .push_back( Gtk::Menu_Helpers::MenuElem( _("_View"), *menu ) ); @@ -1037,16 +1037,16 @@ void Win_GParted::menu_gparted_refresh_devices() } } -void Win_GParted::menu_gparted_filesystems() +void Win_GParted::menu_gparted_features() { - Dialog_Filesystems dialog ; + DialogFeatures dialog ; dialog .set_transient_for( *this ) ; - dialog .Load_Filesystems( gparted_core .get_filesystems() ) ; + dialog .load_filesystems( gparted_core .get_filesystems() ) ; while ( dialog .run() == Gtk::RESPONSE_OK ) { gparted_core .find_supported_filesystems() ; - dialog .Load_Filesystems( gparted_core .get_filesystems() ) ; + dialog .load_filesystems( gparted_core .get_filesystems() ) ; //recreate format menu... menu_partition .items()[ 8 ] .remove_submenu() ;