Extra color schemes

NEWS

@@ -4,6 +4,11 @@ Verison 0.7.0:
 - Add shortcut for transparency level (#481)
 - Add label to tell user how to disable a shortcut (#488)
 - Expose cursor_shape and blink cursor method in pref window (#505)
+- some window management bug fixes (#506, #445)
+- expose Guake startup script to the pref window (#198)
+- Force $TERM environment variable to 'xterm-256color' in terminals (#341)
+- Fix "Not focused on openning if tab was moved" (#441)
+
 
 Version 0.6.2:
 - Packaging issue fixes

data/about.glade

@@ -30,6 +30,7 @@ Aleksandar Krsteski (SnapShot) <aleksandar@guake.org>
 
 Contributors:
 Maxim Ivanov (ulidtko) <ulidtko@gmail.com>
+Adonis K. (adonisk) <aklp08@gmail.com>
 
 Past Contributors:
 Gabriel Falcão &lt;gabriel@guake-terminal.org&gt;</property>

data/prefs.glade

@@ -281,7 +281,7 @@
                                   <widget class="GtkTable" id="table5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="n_rows">3</property>
+                                    <property name="n_rows">4</property>
                                     <property name="n_columns">2</property>
                                     <child>
                                       <widget class="GtkCheckButton" id="use_trayicon">
@@ -373,6 +373,51 @@
                                         <property name="y_options"/>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="startup_script">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip" translatable="yes">Path to a bash script that would be automatically executed when guake starts, unless you specify --no-startup-script.
+
+This would typically use the configuration by command line feature of guake:
+
+#!/bin/bash
+
+sleep 5  # it is advised to wait a bit guake has been successfully started
+
+guake -r "main" -e "cd ~/projects/myproject/main"
+guake -r "prod" -e "cd ~/projects/myproject/prod"
+</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" handler="on_startup_script_changed" swapped="no"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="lbl_startup_script">
+                                        <property name="width_request">160</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Path to script to execute on Guake start</property>
+                                        <property name="use_markup">True</property>
+                                        <property name="single_line_mode">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                      </packing>
+                                    </child>
                                     <child>
                                       <placeholder/>
                                     </child>
@@ -1408,15 +1453,138 @@ Underline</property>
                                   <widget class="GtkComboBox" id="palette_name">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="items" translatable="yes">Tango
-Solarized
-Linux console
-XTerm
-Rxvt
-Monokai
-Lucario
+                                    <property name="items" translatable="yes">3024 Day
+3024 Night
+Adventure Time
+Afterglow
+Alien Blood
+Argonaut
+Arthur
+Atom
+Belafonte Day
+Belafonte Night
+Birdsofparadise
+Blazer
+Borland
+Broadcast
+Brogrammer
+C64
+Chalk
+Chalkboard
+Ciapre
+Clrs
+Cobalt Neon
 Cobalt2
+Crayon Pony Fish
+Dark Pastel
+Darkside
+Desert
+Dimmed Monokai
+Dracula
+Earthsong
+Elemental
+Espresso Libre
+Espresso
+Fideloper
+Fishtank
+Flat
 Flatland
+Frontend Delight
+Frontend Fun Forrest
+Frontend Galaxy
+Github
+Grape
+Grass
+Hardcore
+Harper
+Highway
+Hipster Green
+Homebrew
+Hurtado
+Hybrid
+Ic Green Ppl
+Ic Orange Ppl
+Idle Toes
+Ir Black
+Jackie Brown
+Japanesque
+Jellybeans
+Kibble
+Later This Evening
+Lavandula
+Linux Console
+Liquid Carbon Transparent
+Liquid Carbon
+Lucario
+Man Page
+Mathias
+Medallion
+Misterioso
+Molokai
+Mona Lisa
+Monokai Cobalt2
+Monokai Soda
+Monokai
+N0tch2k
+Neopolitan
+Neutron
+Nightlion V1
+Nightlion V2
+Novel
+Obsidian
+Ocean
+Ollie
+One Dark
+Paul Millr
+Pencil Dark
+Pencil Light
+Pnevma
+Pro
+Red Alert
+Red Sands
+Rippedcasts
+Royal
+Rxvt
+Sea Shells
+Seafoam Pastel
+Seti
+Shaman
+Slate
+Smyck
+Soft Server
+Solarized Darcula
+Solarized Dark Higher Contrast
+Solarized Dark
+Solarized Light
+Space Gray Eighties
+Space Gray
+Spacedust
+Spring
+Square
+Sundried
+Symphonic
+Tango
+Teerb
+Terminal Basic
+Thayer Bright
+Tomorrow Night Blue
+Tomorrow Night Bright
+Tomorrow Night Eighties
+Tomorrow Night
+Tomorrow
+Toy Chest
+Treehouse
+Twilight
+Urple
+Vaughn
+Vibrant Ink
+Warm Neon
+Wez
+Wild Cherry
+Wombat
+Wryan
+Xterm
+Zenburn
 Custom
 </property>
                                     <signal name="changed" handler="on_palette_name_changed" swapped="no"/>
@@ -1689,7 +1857,7 @@ Custom
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
-                                        <property name="tooltip" translatable="yes">Backgrount color</property>
+                                        <property name="tooltip" translatable="yes">Background color</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="color">#000000000000</property>
                                         <signal name="color_set" handler="on_palette_color_set" swapped="no"/>

dev.sh

@@ -51,10 +51,10 @@ fi
 
 if [[ $NO_INSTALL == true ]]; then
     gconftool-2 --install-schema-file=data/guake.schemas
-    PYTHONPATH=src python src/guake/main.py
+    PYTHONPATH=src python src/guake/main.py --no-startup-script
 else
   sudo make install && gconftool-2 --install-schema-file=/usr/local/etc/gconf/schemas/guake.schemas || exit 1
 
   guake --quit 2> /dev/null
-  guake
+  guake --no-startup-script
 fi

src/guake/guake_app.py

@@ -1365,6 +1365,7 @@ def on_drop_tab(self, widget, context, x, y, selection, targetType, data):
     def move_tab(self, old_tab_pos, new_tab_pos):
         self.notebook.reorder_child(self.notebook.get_nth_page(old_tab_pos), new_tab_pos)
         self.tabs.reorder_child(self.tabs.get_children()[old_tab_pos], new_tab_pos)
+        self.notebook.set_current_page(new_tab_pos)
 
     def delete_tab(self, pagepos, kill=True):
         """This function will destroy the notebook page, terminal and
@@ -1385,6 +1386,11 @@ def set_terminal_focus(self):
         """Grabs the focus on the current tab.
         """
         self.notebook.get_current_terminal().grab_focus()
+        self.notebook.set_current_page(self.get_selected_tab())
+        # Hack to fix "Not focused on openning if tab was moved" (#441)
+        pos = self.get_selected_tab()
+        self.select_tab(0)
+        self.select_tab(pos)
 
     def select_current_tab(self, notebook, user_data, page):
         """When current self.notebook page is changed, the tab bar

src/guake/main.py

@@ -54,6 +54,9 @@ def main():
     if "COLORTERM" in os.environ:
         del os.environ['COLORTERM']
 
+    # Force to xterm-256 colors for compatibility with some old command line programs
+    os.environ["TERM"] = "xterm-256color"
+
     parser = OptionParser()
     parser.add_option('-f', '--fullscreen', dest='fullscreen',
                       action='store_true', default=False,
@@ -125,6 +128,10 @@ def main():
                       action='store_true', default=False,
                       help=_('Says to Guake go away =('))
 
+    parser.add_option('-u', '--no-startup-script', dest='execute_startup_script',
+                      action='store_false', default=True,
+                      help=_('Do not execute the start up script'))
+
     options = parser.parse_args()[0]
 
     instance = None
@@ -196,23 +203,21 @@ def main():
         remote_object.show_about()
         only_show_hide = False
 
-    if options.quit:
-        remote_object.quit()
-        only_show_hide = False
-
     if already_running and only_show_hide:
         # here we know that guake was called without any parameter and
         # it is already running, so, lets toggle its visibility.
         remote_object.show_hide()
 
-    if not already_running:
+    if options.execute_startup_script and not already_running:
         startup_script = instance.client.get_string(KEY("/general/startup_script"))
         if startup_script:
-            print("Calling startup script: ", startup_script)
+            print("Calling startup script:", startup_script)
             pid = subprocess.Popen([startup_script], shell=True, stdin=None, stdout=None,
                                    stderr=None, close_fds=True)
-            print("Script started with pid", pid)
+            print("Startup script started with pid:", pid)
             # Please ensure this is the last line !!!!
+    else:
+        print("--no-startup-script argument defined, so don't execute the startup script")
     return already_running