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

Added language length conditional Undo display. 

If translated language is relatively long, then split the "Resize/Move" toolbar button text into two lines, and do not display the "Undo" button.

svn path=/trunk/; revision=971
This commit is contained in:
Curtis Gedak 2008-11-19 20:17:32 +00:00
parent c4bc4430c7
commit 1582dc3c64
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-11-19 Curtis Gedak <gedakc@gmail.com>
* src/Win_GParted.cc: Added language length conditional Undo display.
- If translated language is relatively long, then
split the "Resize/Move" toolbar button text into two lines, and
do not display the "Undo" button.
- Permits all languages to see a full toolbar at default window size.
- Closes GParted bug #561068
2008-11-18 Curtis Gedak <gedakc@gmail.com> 2008-11-18 Curtis Gedak <gedakc@gmail.com>
* include/Partition.h, * include/Partition.h,

14
src/Win_GParted.cc
View File

@ -223,7 +223,16 @@ void Win_GParted::init_toolbar()
//RESIZE/MOVE //RESIZE/MOVE
image = manage( new Gtk::Image( Gtk::Stock::GOTO_LAST, Gtk::ICON_SIZE_BUTTON ) ); image = manage( new Gtk::Image( Gtk::Stock::GOTO_LAST, Gtk::ICON_SIZE_BUTTON ) );
toolbutton = Gtk::manage(new Gtk::ToolButton( *image, _("Resize/Move") )); Glib::ustring str_temp = _("Resize/Move") ;
//Condition string split and Undo button.
// for longer translated string, split string in two and skip the Undo button to permit full toolbar to display
// FIXME: Is there a better way to do this, perhaps without the conditional? At the moment this seems to be the best compromise.
bool display_undo = true ;
if( str_temp .length() > 14 ) {
str_temp .replace( str_temp .find( "/" ), 1, "\n/" ) ;
display_undo = false ;
}
toolbutton = Gtk::manage(new Gtk::ToolButton( *image, str_temp ));
toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_resize) ); toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_resize) );
toolbar_main.append(*toolbutton); toolbar_main.append(*toolbutton);
TOOLBAR_RESIZE_MOVE = index++ ; TOOLBAR_RESIZE_MOVE = index++ ;
@ -246,12 +255,15 @@ void Win_GParted::init_toolbar()
index++ ; index++ ;
//UNDO and APPLY //UNDO and APPLY
if ( display_undo ) {
//Undo button is displayed only if translated language "Resize/Move" is not too long. See above setting of this condition.
toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::UNDO)); toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::UNDO));
toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_undo) ); toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_undo) );
toolbar_main.append(*toolbutton); toolbar_main.append(*toolbutton);
TOOLBAR_UNDO = index++ ; TOOLBAR_UNDO = index++ ;
toolbutton ->set_sensitive( false ); toolbutton ->set_sensitive( false );
toolbutton ->set_tooltip(tooltips, _("Undo Last Operation") ); toolbutton ->set_tooltip(tooltips, _("Undo Last Operation") );
}
toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::APPLY)); toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::APPLY));
toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_apply) ); toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_apply) );