Changeset 3144Tweet

Timestamp:

Oct 30, 2008, 2:02:29 AM (15 years ago)

Author:

Sam Hocevar

Message:

ThePimp?: add Fullscreen support, including the F11 binding.

Location:

libpipi/trunk/ThePimp

Files:

• gtk-gui/ThePimp.MainWindow.cs (modified) (7 diffs)
• gtk-gui/gui.stetic (modified) (5 diffs)
• src/MainWindow.cs (modified) (2 diffs)

libpipi/trunk/ThePimp/gtk-gui/ThePimp.MainWindow.cs

@@ -69 +69 @@
         
         private Gtk.Action saveAsAction;
+        
+        private Gtk.Action FullscreenAction;
         
         private Gtk.VBox vbox1;
@@ -182 +184 @@
             this.saveAsAction = new Gtk.Action("saveAsAction", null, Mono.Unix.Catalog.GetString("Save active image "), "gtk-save-as");
             w2.Add(this.saveAsAction, null);
+            this.FullscreenAction = new Gtk.Action("FullscreenAction", Mono.Unix.Catalog.GetString("Fullscreen"), null, "gtk-fullscreen");
+            this.FullscreenAction.ShortLabel = Mono.Unix.Catalog.GetString("Fullscreen");
+            w2.Add(this.FullscreenAction, null);
             w1.InsertActionGroup(w2, 0);
             this.AddAccelGroup(w1.AccelGroup);
@@ -192 +197 @@
             this.vbox1.Name = "vbox1";
             // Container child vbox1.Gtk.Box+BoxChild
-            w1.AddUiFromString("<ui><menubar name='menubar1'><menu action='FileAction'><menuitem action='NewAction'/><menuitem action='OpenAction'/><menuitem action='SaveAction'/><menuitem action='SaveAsAction'/><menuitem action='QuitAction'/></menu><menu action='EditAction'><menuitem action='UndoAction'/><menuitem action='RedoAction'/></menu><menu action='ViewAction'><menuitem action='ZoomInAction'/><menuitem action='ZoomOutAction'/><menuitem action='BestFitAction'/><menuitem action='NormalSizeAction'/></menu><menu action='HelpAction'><menuitem action='HelpAction1'/><menuitem action='AboutAction'/></menu></menubar></ui>");
+            w1.AddUiFromString("<ui><menubar name='menubar1'><menu action='FileAction'><menuitem action='NewAction'/><menuitem action='OpenAction'/><menuitem action='SaveAction'/><menuitem action='SaveAsAction'/><menuitem action='QuitAction'/></menu><menu action='EditAction'><menuitem action='UndoAction'/><menuitem action='RedoAction'/></menu><menu action='ViewAction'><menuitem action='ZoomInAction'/><menuitem action='ZoomOutAction'/><menuitem action='BestFitAction'/><menuitem action='NormalSizeAction'/><separator/><menuitem action='FullscreenAction'/></menu><menu action='HelpAction'><menuitem action='HelpAction1'/><menuitem action='AboutAction'/></menu></menubar></ui>");
             this.menubar1 = ((Gtk.MenuBar)(w1.GetWidget("/menubar1")));
             this.menubar1.Name = "menubar1";
@@ -220 +225 @@
             this.vpaned1.CanFocus = true;
             this.vpaned1.Name = "vpaned1";
-            this.vpaned1.Position = 42;
+            this.vpaned1.Position = 41;
             this.hpaned1.Add(this.vpaned1);
             Gtk.Paned.PanedChild w5 = ((Gtk.Paned.PanedChild)(this.hpaned1[this.vpaned1]));
@@ -228 +233 @@
             this.hpaned2.CanFocus = true;
             this.hpaned2.Name = "hpaned2";
-            this.hpaned2.Position = 883;
+            this.hpaned2.Position = 886;
             // Container child hpaned2.Gtk.Paned+PanedChild
             this.notebook1 = new Gtk.Notebook();
@@ -242 +247 @@
             this.vpaned2.CanFocus = true;
             this.vpaned2.Name = "vpaned2";
-            this.vpaned2.Position = 42;
+            this.vpaned2.Position = 41;
             this.hpaned2.Add(this.vpaned2);
             Gtk.Paned.PanedChild w7 = ((Gtk.Paned.PanedChild)(this.hpaned2[this.vpaned2]));
@@ -278 +283 @@
             this.AboutAction.Activated += new System.EventHandler(this.OnAboutActionActivated);
             this.saveAsAction.Activated += new System.EventHandler(this.OnSaveAsActionActivated);
+            this.FullscreenAction.Activated += new System.EventHandler(this.OnFullscreenActionActivated);
         }
     }

libpipi/trunk/ThePimp/gtk-gui/gui.stetic

@@ -194 +194 @@
         <property name="Tooltip" translatable="yes">Save active image </property>
         <signal name="Activated" handler="OnSaveAsActionActivated" />
+      </action>
+      <action id="FullscreenAction">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Fullscreen</property>
+        <property name="ShortLabel" translatable="yes">Fullscreen</property>
+        <property name="StockId">gtk-fullscreen</property>
+        <signal name="Activated" handler="OnFullscreenActionActivated" />
       </action>
     </action-group>
@@ -224 +231 @@
                 <node type="Menuitem" action="BestFitAction" />
                 <node type="Menuitem" action="NormalSizeAction" />
+                <node type="Separator" />
+                <node type="Menuitem" action="FullscreenAction" />
               </node>
               <node type="Menu" action="HelpAction">
@@ -275 +284 @@
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Position">42</property>
+                <property name="Position">41</property>
                 <child>
                   <placeholder />
@@ -291 +300 @@
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Position">883</property>
+                <property name="Position">886</property>
                 <child>
                   <widget class="Gtk.Notebook" id="notebook1">
@@ -310 +319 @@
                     <property name="MemberName" />
                     <property name="CanFocus">True</property>
-                    <property name="Position">42</property>
+                    <property name="Position">41</property>
                     <child>
                       <placeholder />

libpipi/trunk/ThePimp/src/MainWindow.cs

@@ -20 +20 @@
 namespace ThePimp
 {
+    [Gtk.Binding(Gdk.Key.F11, "ToggleFullScreen")]
+
     public partial class MainWindow: Gtk.Window
     {
@@ -103 +105 @@
         {
         }
+
+        private bool _fullscreen = false;
+        protected virtual void ToggleFullScreen()
+        {
+            _fullscreen = !_fullscreen;
+
+            if(_fullscreen)
+                Fullscreen();
+            else
+                Unfullscreen();
+        }
+
+        protected virtual void OnFullscreenActionActivated (object sender, System.EventArgs e)
+        {
+            ToggleFullScreen();
+        }
     }
 }