Merge lp:~bdfhjk/clicompanion/fix-684336 into lp:clicompanion

[Marek Bardoński]

[Duane Hinnen (duanedesign)]

Look at the TODO: on line 145 of view.py.
I added that awhile back and thought it might be able to be used to fix this issue.
What do you think?
Do you think either solution has any advantage?
Thank you for your work on this.
Good Job!

review: Needs Information

[Marek Bardoński (bardonski)]

I look at this for about 2h

[Marek Bardoński (bdfhjk)]

I look at this for about 2h

[Marek Bardoński (bdfhjk)]

'''I will check it in two hours

[lp:~bdfhjk/clicompanion/fix-684336]

72. By bdfhjk on 2011-03-21

better resolution get

[Marek Bardoński (bdfhjk)]

Yes.

I used it now.

[Duane Hinnen (duanedesign)]

Good job, looks good.

review: Approve

=== modified file 'clicompanionlib/tabs.py'
--- clicompanionlib/tabs.py	2011-03-02 12:20:09 +0000
+++ clicompanionlib/tabs.py	2011-03-21 16:58:25 +0000
@@ -26,6 +26,7 @@
 
 from clicompanionlib.utils import get_user_shell
 import clicompanionlib.controller
+import view
 
 CONFIGFILE = os.path.expanduser("~/.config/clicompanion/config")
 gcp=0;
@@ -36,7 +37,11 @@
     '''
     def add_tab(self,widget, notebook):
         _vte = vte.Terminal()
-        _vte.set_size_request(700, 220)
+        if view.NETBOOKMODE == 1:
+            _vte.set_size_request(700, 120)
+        else:
+		    _vte.set_size_request(700, 220) 
+       
         _vte.connect ("child-exited", lambda term: gtk.main_quit())
         _vte.fork_command(get_user_shell()) # Get the user's default shell
         
 
=== modified file 'clicompanionlib/view.py'
--- clicompanionlib/view.py	2011-03-21 12:43:08 +0000
+++ clicompanionlib/view.py	2011-03-21 16:58:25 +0000
@@ -62,11 +62,17 @@
     ('STRING', 0, 3),
     ]
 FILTER = 0
+NETBOOKMODE = 0
 
 
 class MainWindow():
     liststore = gtk.ListStore(str, str, str)
-
+    screen = gtk.gdk.display_get_default().get_default_screen()
+    screen_size = screen.get_monitor_geometry(0)
+    height =  screen.get_height() ## screen height ##
+    global NETBOOKMODE
+    if height < 750:
+		NETBOOKMODE = 1
     ## open file containing command list and put it in a variable
     def update(self, liststore):
         try:
@@ -140,13 +146,6 @@
         ##create the config file
         conf_mod = Config()
         conf_mod.create_config()
-
-        
-        #TODO: do we want to do this? Or just keep the height under 600.
-        ##Get user screen size##
-        #screen = gtk.gdk.display_get_default().get_default_screen()
-        #screen_size = screen.get_monitor_geometry(0)
-        #height =  screen.get_height() ## screen height ##
         
         ## Create UI widgets
         window = gtk.Window(gtk.WINDOW_TOPLEVEL)
@@ -157,8 +156,14 @@
         notebook = gtk.Notebook()
 
         ## set sizes and borders
-        scrolledwindow.set_size_request(700, 220)
-        window.set_default_size(700, 625)
+        
+        global NETBOOKMODE
+        if NETBOOKMODE == 1:
+            scrolledwindow.set_size_request(700, 200)
+            window.set_default_size(700, 500)
+        else:
+            scrolledwindow.set_size_request(700, 220)
+            window.set_default_size(700, 625)
         window.set_border_width(10)
         ## Sets the position of the window relative to the screen
         window.set_position(gtk.WIN_POS_CENTER_ALWAYS)