Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bart Hakvoort 2006-04-05 09:33:04 +00:00
parent 9ca2e680d7
commit 17e088553d
9 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2006-04-05 Bart Hakvoort <hakvoort@cvs.gnome.org>
* 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 <hakvoort@cvs.gnome.org>
* configure.in: bumped to gparted-0.2.4

19
include/Dialog_Filesystems.h → include/DialogFeatures.h
View File

@ -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<FS> & FILESYSTEMS ) ;
~Dialog_Filesystems() ;
DialogFeatures() ;
~DialogFeatures() ;
void load_filesystems( const std::vector<FS> & 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

4
include/Makefile.am
View File

@ -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

2
include/Win_GParted.h
View File

@ -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();

2
po/POTFILES.in
View File

@ -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

16
src/Dialog_Filesystems.cc → src/DialogFeatures.cc
View File

@ -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 <gtkmm/stock.h>
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<FS> & FILESYSTEMS )
void DialogFeatures::load_filesystems( const std::vector<FS> & 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()
{
}

3
src/DialogManageFlags.cc
View File

@ -30,7 +30,7 @@ DialogManageFlags::DialogManageFlags( const Partition & partition, std::map<Glib
set_title( String::ucompose( _("Manage flags on %1"), partition .get_path() ) );
set_has_separator( false ) ;
set_default_size( 300, -1 ) ;
set_resizable( false ) ;
Glib::ustring str_temp = "<span weight=\"bold\" size=\"larger\">" ;
str_temp += String::ucompose( _("Manage flags on %1"), partition .get_path() ) ;
@ -49,6 +49,7 @@ DialogManageFlags::DialogManageFlags( const Partition & partition, std::map<Glib
static_cast<Gtk::CellRendererToggle *>( 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 ;

4
src/Makefile.am
View File

@ -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

14
src/Win_GParted.cc
View File

@ -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() ;