Changeset 4f4ab35d5cb2363dd464e6b252d1c798bd01c2fb
- Timestamp:
- 10/06/07 16:56:50 (4 years ago)
- Children:
- 2714ccfd853a3c3b42ba50550cb4e43059e73130
- Parents:
- 8973af85108c889f7dc16af2d8443d0f8ff3ec05
- git-committer:
- Lincoln de Sousa <lincoln@…> (10/06/07 16:56:50)
- Files:
-
- 5 modified
-
ChangeLog (modified) (1 diff)
-
data/guake.glade (modified) (6 diffs)
-
data/prefs.glade (modified) (32 diffs)
-
m4/intltool.m4 (modified) (8 diffs)
-
src/guake.py (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r8973af8 r4f4ab35 1 2007-10-02 Lincoln de Sousa <lincoln@minaslivre.org> 2 3 * src/guake.py (PrefsDialog): 4 * src/guake.py (PrefsDialog.load_configs): Widget spinHistorySize renamed 5 to historysize-spinbutton to follow the name of other widgets, because of 6 this, the callback on_spinHistorySize_value_changed was renamed to 7 on_historysize_spinbutton_value_changed. Removed animate flag button 8 changer. 9 10 * src/guake.py (PrefsDialog.load_configs): Adding warnings when unable to 11 parse a color. 12 13 * src/guake.py (PrefsDialog.on_show_scrollbar_checkbutton_toggled): Pep8'ed 14 15 * src/guake.py 16 (PrefsDialog.on_bgimage_filechooserbutton_selection_changed): little var 17 name clean. 18 19 * src/guake.py (Guake.refresh): Comment updated, misspell fixed. 20 21 * src/guake.py (Guake.show): Moving add_tab call to be called before 22 self.window.show, to avoid blank screens before adding a tab. And some 23 unuseful function calls removed. Not this method resizes and shows the main 24 window, see the next entry to understand why. 25 26 * src/guake.py (Guake.animate_hide, Guake.animate_show): Removed, we will 27 wait a better moment to implement animated things, now Guake.show and 28 Guake.hide makes the work alone. 29 30 * data/guake.glade: window-root is not a popup any more, now it's a 31 toplevel window, his type_hint is Normal by default, etc. The 32 notebook-terminals widget had his tabs hidden by default, now it can has 33 focus, all borders were set to 0, empty pages were removed, because it is 34 added by code, not in the glade file. toolbar widget height was set to 22. 35 36 * data/prefs.glade: spinHistorySize widget was renamed to 37 historysize-spinbutton (his change signall too), padding and spacing 38 changed in many places, misspell fixed in "Hide on lose focus" and remove 39 option to choose animated show/hide. 40 1 41 2007-06-21 Lincoln de Sousa <lincoln@archlinux-br.org> 2 42 -
data/guake.glade
r8973af8 r4f4ab35 1 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 2 2 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> 3 <!-- Generated with glade3 3.2.2 on Wed Jun 6 23:00:05 2007 by pythonwarrior@pidinti-->3 <!--*- mode: xml -*--> 4 4 <glade-interface> 5 5 <widget class="GtkWindow" id="window-root"> 6 6 <property name="has_focus">True</property> 7 <property name="is_focus">True</property>8 7 <property name="title" translatable="yes">Guake!</property> 9 8 <property name="modal">True</property> 9 <property name="window_position">GTK_WIN_POS_CENTER</property> 10 10 <property name="skip_taskbar_hint">True</property> 11 11 <property name="skip_pager_hint">True</property> 12 12 <property name="urgency_hint">True</property> 13 13 <property name="decorated">False</property> 14 <property name="deletable">False</property>15 14 <property name="gravity">GDK_GRAVITY_STATIC</property> 16 15 <child> … … 20 19 <widget class="GtkNotebook" id="notebook-teminals"> 21 20 <property name="visible">True</property> 21 <property name="can_focus">True</property> 22 <property name="has_focus">True</property> 23 <property name="is_focus">True</property> 22 24 <property name="tab_pos">GTK_POS_BOTTOM</property> 25 <property name="show_tabs">False</property> 23 26 <property name="scrollable">True</property> 24 27 <property name="tab_border">0</property> … … 26 29 <property name="tab_vborder">0</property> 27 30 <property name="enable_popup">True</property> 28 <property name="homogeneous">True</property>29 31 <child> 30 32 <placeholder/> … … 40 42 <child> 41 43 <widget class="GtkHBox" id="toolbar"> 42 <property name="height_request"> 30</property>44 <property name="height_request">22</property> 43 45 <property name="visible">True</property> 44 46 <child> … … 76 78 <widget class="GtkHButtonBox" id="hbuttonbox1"> 77 79 <property name="visible">True</property> 78 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>79 <property name="homogeneous">True</property>80 80 <property name="layout_style">GTK_BUTTONBOX_END</property> 81 81 <child> 82 82 <widget class="GtkButton" id="add-button"> 83 83 <property name="visible">True</property> 84 <property name="resize_mode">GTK_RESIZE_IMMEDIATE</property>85 84 <property name="response_id">0</property> 86 85 <signal name="clicked" handler="on_add_button_clicked"/> … … 108 107 </child> 109 108 </widget> 110 <packing>111 <property name="expand">False</property>112 <property name="fill">False</property>113 </packing>114 109 </child> 115 110 </widget> -
data/prefs.glade
r8973af8 r4f4ab35 17 17 <widget class="GtkVBox" id="vbox5"> 18 18 <property name="visible">True</property> 19 <property name="spacing">2</property> 19 20 <child> 20 21 <widget class="GtkHBox" id="hbox9"> … … 59 60 <widget class="GtkFrame" id="frame7"> 60 61 <property name="visible">True</property> 61 <property name="label_xalign">0</property>62 62 <property name="shadow_type">GTK_SHADOW_NONE</property> 63 63 <child> … … 109 109 </child> 110 110 <child> 111 <widget class="GtkSpinButton" id=" spinHistorySize">111 <widget class="GtkSpinButton" id="historysize-spinbutton"> 112 112 <property name="visible">True</property> 113 113 <property name="can_focus">True</property> … … 116 116 <property name="snap_to_ticks">True</property> 117 117 <property name="numeric">True</property> 118 <signal name="value_changed" handler="on_ spinHistorySize_value_changed"/>118 <signal name="value_changed" handler="on_historysize_spinbutton_value_changed"/> 119 119 <signal name="change_value" handler="on_spinHistorySize_change_value"/> 120 120 </widget> … … 135 135 <widget class="GtkLabel" id="label8"> 136 136 <property name="visible">True</property> 137 <property name="ypad">6</property> 137 138 <property name="label" translatable="yes"><b>Shell</b></property> 138 139 <property name="use_markup">True</property> … … 150 151 <widget class="GtkFrame" id="frame4"> 151 152 <property name="visible">True</property> 152 <property name="label_xalign">0</property>153 153 <property name="shadow_type">GTK_SHADOW_NONE</property> 154 154 <child> … … 161 161 <property name="spacing">4</property> 162 162 <child> 163 <widget class="GtkCheckButton" id="animate-checkbutton">164 <property name="visible">True</property>165 <property name="label" translatable="yes">Animate on "show and hide"</property>166 <property name="use_underline">True</property>167 <property name="focus_on_click">False</property>168 <property name="active">True</property>169 <property name="draw_indicator">True</property>170 <signal name="toggled" handler="on_animate_checkbutton_toggled"/>171 </widget>172 <packing>173 <property name="expand">False</property>174 </packing>175 </child>176 <child>177 163 <widget class="GtkCheckButton" id="ontop-checkbutton"> 178 164 <property name="visible">True</property> … … 180 166 <property name="use_underline">True</property> 181 167 <property name="focus_on_click">False</property> 168 <property name="response_id">0</property> 182 169 <property name="active">True</property> 183 170 <property name="draw_indicator">True</property> … … 193 180 <property name="visible">True</property> 194 181 <property name="can_focus">True</property> 195 <property name="label" translatable="yes">Hide on los tfocus</property>182 <property name="label" translatable="yes">Hide on lose focus</property> 196 183 <property name="use_underline">True</property> 184 <property name="response_id">0</property> 197 185 <property name="active">True</property> 198 186 <property name="draw_indicator">True</property> … … 211 199 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 212 200 <property name="label" translatable="yes">Show scrollbar</property> 201 <property name="response_id">0</property> 213 202 <property name="draw_indicator">True</property> 214 203 <signal name="toggled" handler="on_show_scrollbar_checkbutton_toggled"/> … … 225 214 <widget class="GtkLabel" id="label20"> 226 215 <property name="visible">True</property> 216 <property name="ypad">6</property> 227 217 <property name="label" translatable="yes"><b>Window behavior</b></property> 228 218 <property name="use_markup">True</property> … … 240 230 <widget class="GtkFrame" id="frame11"> 241 231 <property name="visible">True</property> 242 <property name="label_xalign">0</property>243 232 <property name="shadow_type">GTK_SHADOW_NONE</property> 244 233 <child> … … 263 252 <widget class="GtkLabel" id="label24"> 264 253 <property name="visible">True</property> 254 <property name="ypad">6</property> 265 255 <property name="label" translatable="yes"><b>Window size</b></property> 266 256 <property name="use_markup">True</property> … … 279 269 <widget class="GtkFrame" id="frame6"> 280 270 <property name="visible">True</property> 281 <property name="label_xalign">0</property>282 271 <property name="shadow_type">GTK_SHADOW_NONE</property> 283 272 <child> 284 273 <widget class="GtkAlignment" id="alignment6"> 285 274 <property name="visible">True</property> 275 <property name="top_padding">4</property> 286 276 <property name="left_padding">20</property> 287 277 <child> … … 308 298 <property name="label" translatable="yes">Bottom</property> 309 299 <property name="use_underline">True</property> 300 <property name="response_id">0</property> 310 301 <property name="active">True</property> 311 302 <property name="draw_indicator">True</property> … … 336 327 <property name="label" translatable="yes">Top</property> 337 328 <property name="use_underline">True</property> 329 <property name="response_id">0</property> 338 330 <property name="active">True</property> 339 331 <property name="draw_indicator">True</property> … … 362 354 <widget class="GtkLabel" id="label19"> 363 355 <property name="visible">True</property> 356 <property name="ypad">6</property> 364 357 <property name="label" translatable="yes"><b>Tab position</b></property> 365 358 <property name="use_markup">True</property> … … 375 368 </child> 376 369 </widget> 377 <packing>378 <property name="tab_expand">False</property>379 </packing>380 370 </child> 381 371 <child> … … 387 377 <packing> 388 378 <property name="type">tab</property> 389 <property name="tab_expand">False</property>390 379 <property name="tab_fill">False</property> 391 380 </packing> … … 399 388 <widget class="GtkFrame" id="frame1"> 400 389 <property name="visible">True</property> 401 <property name="label_xalign">0</property>402 390 <property name="shadow_type">GTK_SHADOW_NONE</property> 403 391 <child> … … 430 418 <property name="visible">True</property> 431 419 <property name="focus_on_click">False</property> 420 <property name="response_id">0</property> 432 421 <property name="title" translatable="yes">Choose some font</property> 433 422 <signal name="font_set" handler="on_fontbutton_font_set"/> … … 462 451 <widget class="GtkColorButton" id="font-colorbutton"> 463 452 <property name="visible">True</property> 453 <property name="response_id">0</property> 464 454 <property name="title" translatable="yes">Choose some color</property> 465 455 <signal name="color_set" handler="on_font_colorbutton_color_set"/> … … 482 472 <widget class="GtkLabel" id="label9"> 483 473 <property name="visible">True</property> 474 <property name="ypad">6</property> 484 475 <property name="label" translatable="yes"><b>Fonts</b></property> 485 476 <property name="use_markup">True</property> … … 497 488 <widget class="GtkFrame" id="frame2"> 498 489 <property name="visible">True</property> 499 <property name="label_xalign">0</property>500 490 <property name="shadow_type">GTK_SHADOW_NONE</property> 501 491 <child> … … 527 517 <widget class="GtkColorButton" id="bg-colorbutton"> 528 518 <property name="visible">True</property> 519 <property name="response_id">0</property> 529 520 <property name="title" translatable="yes">Choose some color</property> 530 521 <signal name="color_set" handler="on_bg_colorbutton_color_set"/> … … 618 609 <property name="visible">True</property> 619 610 <property name="can_focus">True</property> 611 <property name="response_id">0</property> 620 612 <property name="active">True</property> 621 613 <property name="draw_indicator">True</property> … … 642 634 <widget class="GtkLabel" id="label12"> 643 635 <property name="visible">True</property> 636 <property name="ypad">6</property> 644 637 <property name="label" translatable="yes"><b>Background</b></property> 645 638 <property name="use_markup">True</property> … … 658 651 <packing> 659 652 <property name="position">1</property> 660 <property name="tab_expand">False</property>661 653 </packing> 662 654 </child> … … 670 662 <property name="type">tab</property> 671 663 <property name="position">1</property> 672 <property name="tab_expand">False</property>673 664 <property name="tab_fill">False</property> 674 665 </packing> … … 697 688 <packing> 698 689 <property name="position">2</property> 699 <property name="tab_expand">False</property>700 690 </packing> 701 691 </child> … … 708 698 <property name="type">tab</property> 709 699 <property name="position">2</property> 710 <property name="tab_expand">False</property>711 700 <property name="tab_fill">False</property> 712 701 </packing> … … 729 718 <property name="label">gtk-close</property> 730 719 <property name="use_stock">True</property> 720 <property name="response_id">0</property> 731 721 <signal name="clicked" handler="gtk_widget_destroy" object="config-window"/> 732 722 </widget> -
m4/intltool.m4
r8973af8 r4f4ab35 24 24 25 25 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) 26 # serial 3 5IT_PROG_INTLTOOL26 # serial 36 IT_PROG_INTLTOOL 27 27 AC_DEFUN([IT_PROG_INTLTOOL], 28 28 [AC_PREREQ([2.50])dnl … … 37 37 38 38 if test -n "$1"; then 39 AC_MSG_CHECKING( for intltool >= $1)39 AC_MSG_CHECKING([for intltool >= $1]) 40 40 41 41 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` … … 66 66 INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 67 67 INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 68 INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 68 69 69 70 AC_SUBST(INTLTOOL_DESKTOP_RULE) … … 85 86 AC_SUBST(INTLTOOL_THEME_RULE) 86 87 AC_SUBST(INTLTOOL_SERVICE_RULE) 88 AC_SUBST(INTLTOOL_POLICY_RULE) 87 89 88 90 # Use the tools built into the package, not the ones that are installed. … … 107 109 fi 108 110 109 AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)110 AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)111 AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)112 AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)113 114 111 # Substitute ALL_LINGUAS so we can use it in po/Makefile 115 112 AC_SUBST(ALL_LINGUAS) … … 118 115 # (copied from glib-gettext.m4) 119 116 if test -z "$DATADIRNAME"; then 120 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; 121 return _nl_msg_cat_cntr], 117 AC_LINK_IFELSE( 118 [AC_LANG_PROGRAM([[]], 119 [[extern int _nl_msg_cat_cntr; 120 return _nl_msg_cat_cntr]])], 122 121 [DATADIRNAME=share], 123 122 [case $host in … … 160 159 sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ 161 160 -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ 162 -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \163 -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \164 -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \165 -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \166 161 -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ 167 162 < ${ac_aux_dir}/${file}.in > ${file}.out … … 178 173 [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' 179 174 prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 180 INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' 181 INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' 182 INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) 175 INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) 183 176 184 177 ]) -
src/guake.py
r8973af8 r4f4ab35 32 32 import os 33 33 import sys 34 import warnings 34 35 import common 35 36 from common import _ … … 144 145 # history size 145 146 val = self.client.get_int(GCONF_PATH+'general/history_size') 146 self.get_widget(' spinHistorySize').set_value(val)147 self.get_widget('historysize-spinbutton').set_value(val) 147 148 148 149 # scrollbar … … 155 156 156 157 # animate flag 157 ac = self.client.get_bool(GCONF_PATH + 'general/window_animate')158 self.get_widget('animate-checkbutton').set_active(ac)158 #ac = self.client.get_bool(GCONF_PATH + 'general/window_animate') 159 #self.get_widget('animate-checkbutton').set_active(ac) 159 160 160 161 # on top flag … … 182 183 self.get_widget('font-colorbutton').set_color(color) 183 184 except (ValueError, TypeError): 184 # unable to parse color 185 pass 185 warnings.warn('Unable to parse color %s' % val, Warning) 186 186 187 187 # background … … 191 191 self.get_widget('bg-colorbutton').set_color(color) 192 192 except (ValueError, TypeError): 193 # unable to parse color 194 pass 193 warnings.warn('Unable to parse color %s' % val, Warning) 195 194 196 195 self.guake.use_bgimage = self.client.get_bool(GCONF_PATH+'general/use_bgimage') … … 249 248 250 249 # -- callbacks -- 251 def on_spinHistorySize_value_changed(self, spinBtn): 252 val = int(spinBtn.get_value()) 250 251 def on_historysize_spinbutton_value_changed(self, spin): 252 val = int(spin.get_value()) 253 253 self.client.set_int(GCONF_PATH + 'general/history_size', val) 254 254 … … 307 307 308 308 def on_bgimage_filechooserbutton_selection_changed(self, bnt): 309 file = bnt.get_filename() 310 if file: 311 self.client.set_string(GCONF_PATH + 'style/background/image', 312 file) 309 f = bnt.get_filename() 310 if f: 311 self.client.set_string(GCONF_PATH + 'style/background/image', f) 313 312 self.guake.set_bgimage() 314 313 … … 345 344 if filename: 346 345 try: 347 pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename, 256, 256) 346 mkpb = gtk.gdk.pixbuf_new_from_file_at_size 347 pixbuf = mkpb(filename, 256, 256) 348 348 preview.set_from_pixbuf(pixbuf) 349 349 file_chooser.set_preview_widget_active(True) 350 350 except gobject.GError: 351 pass #this exception is raised when user chooses a non-image file or a directory 351 # this exception is raised when user chooses a non-image 352 # file or a directory 353 pass 352 354 else: 353 355 file_chooser.set_preview_widget_active(False) … … 365 367 globalhotkeys.init() 366 368 key = self.client.get_string(GHOTKEYS[0][0]) 367 bind_result = globalhotkeys.bind(key, self.show_hide) 368 if not bind_result: 369 print "Error when binding %s"%key 370 import sys 371 sys.exit(1) 369 globalhotkeys.bind(key, self.show_hide) 370 372 371 # trayicon! 373 372 tray_icon = GuakeStatusIcon() … … 410 409 411 410 def refresh(self): 412 # FIXME: vte.Terminal need to be show edwith his parent window to411 # FIXME: vte.Terminal need to be shown with his parent window to 413 412 # can load his configs of back/fore color, fonts, etc. 414 413 self.window.show_all() … … 439 438 440 439 def show(self, wwidth, hheight): 441 self.window.set_position(gtk.WIN_POS_NONE) 442 self.window.set_gravity(gtk.gdk.GRAVITY_NORTH) 440 # add tab must be called before window.show to avoid a 441 # blank screen before adding the tab. 442 if not self.term_list: 443 self.add_tab() 443 444 self.visible = True 444 445 self.window.move(0, 0) 445 self.window.show() 446 self.window.stick() 447 self.animate_show() 448 if not self.term_list: 449 self.add_tab() 446 self.resize(*self.get_final_window_size()) 447 self.window.show_all() 450 448 451 449 def hide(self): 452 self.animate_hide()453 450 self.window.hide() # FIXME: Don't use hide_all here! 454 self.window.unstick()455 451 self.visible = False 456 457 def animate_show(self, *args):458 width, final_height = self.get_final_window_size()459 if self.client.get_bool(GCONF_PATH+'general/window_animate'):460 self.resize(width, 1)461 for i in range(1, final_height, self.animation_speed):462 self.resize(width, i)463 common.update_ui()464 else:465 self.resize(width, final_height)466 common.update_ui()467 468 def animate_hide(self,*args):469 if self.client.get_bool(GCONF_PATH+'general/window_animate'):470 width, final_height = self.get_final_window_size()471 l = range(1, final_height, self.animation_speed)472 for i in reversed(l):473 self.resize(width, i)474 common.update_ui()475 452 476 453 def get_window_size(self):
