Changeset 8fd387306e4b1be05ca3f43e95e8cb5238d8f0d9

Timestamp:

03/24/09 14:43:11 (3 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

417c2fc26dedefcc7290adcd925c6b3ef656345f

Parents:

a9c19174a0f3c1230e8b29eaaebfda077b0efbef

git-author:

Aleksandar Krsteski <alekrsteski@…> (03/24/09 13:27:32)

git-committer:

Lincoln de Sousa <lincoln@…> (03/24/09 14:43:11)

Message:

Change opacity to transparency

Change the opacity option in preferences dialog to transparency to make
it more logical and intuitive.

Files:

• data/guake.schemas (modified) (1 diff)
• data/prefs.glade (modified) (5 diffs)
• src/guake.py (modified) (3 diffs)
• src/prefs.py (modified) (2 diffs)

data/guake.schemas

@@ -219 +219 @@
 
         <schema>
-            <key>/schemas/apps/guake/style/background/opacity</key>
-            <applyto>/apps/guake/style/background/opacity</applyto>
+            <key>/schemas/apps/guake/style/background/transparency</key>
+            <applyto>/apps/guake/style/background/transparency</applyto>
             <owner>guake</owner>
             <type>int</type>
             <default>80</default>
             <locale name="C">
-                <short>Background opacity.</short>
+                <short>Background transparency.</short>
                 <long>Alpha that will be applied to the terminal
                 background.</long>

data/prefs.glade

@@ -737 +737 @@
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">1</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -748 +748 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Opacity:</property>
+                                        <property name="label" translatable="yes">Transparency:</property>
                                         <property name="use_markup">True</property>
                                       </widget>
@@ -757 +757 @@
                                     </child>
                                     <child>
-                                      <widget class="GtkHScale" id="background_opacity">
+                                      <widget class="GtkHScale" id="background_transparency">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -763 +763 @@
                                         <property name="draw_value">False</property>
                                         <property name="value_pos">GTK_POS_RIGHT</property>
-                                        <signal name="value_changed" handler="on_opacity_value_changed"/>
+                                        <signal name="value_changed" handler="on_transparency_value_changed"/>
                                       </widget>
                                       <packing>
@@ -772 +772 @@
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="position">2</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>

src/guake.py

@@ -106 +106 @@
         notify_add(KEY('/style/background/color'), self.bgcolor_changed)
         notify_add(KEY('/style/background/image'), self.bgimage_changed)
-        notify_add(KEY('/style/background/opacity'), self.bgopacity_changed)
+        notify_add(KEY('/style/background/transparency'), self.bgtransparency_changed)
 
         notify_add(KEY('/general/compat_backspace'), self.backspace_changed)
@@ -257 +257 @@
                     i.set_background_transparent(True)
 
-    def bgopacity_changed(self, client, connection_id, entry, data):
-        """If the gconf var style/background/opacity be changed, this
-        method will be called and will set the saturation and opacity
+    def bgtransparency_changed(self, client, connection_id, entry, data):
+        """If the gconf var style/background/transparency be changed, this
+        method will be called and will set the saturation and transparency
         properties in all terminals open.
         """
-        opacity = entry.value.get_int()
-        for i in self.guake.term_list:
-            i.set_background_saturation(opacity / 100.0)
+        transparency = entry.value.get_int()
+        for i in self.guake.term_list:
+            i.set_background_saturation(transparency / 100.0)
             if self.guake.has_argb:
-                i.set_opacity(65535 / 100 * abs(opacity - 100))
+                i.set_opacity(int((100 - transparency) / 100.0 * 65535))
 
     def backspace_changed(self, client, connection_id, entry, data):
@@ -748 +748 @@
         self.client.notify(KEY('/style/background/color'))
         self.client.notify(KEY('/style/background/image'))
-        self.client.notify(KEY('/style/background/opacity'))
+        self.client.notify(KEY('/style/background/transparency'))
         self.client.notify(KEY('/general/use_default_font'))
 

src/prefs.py

@@ -199 +199 @@
             self.client.set_string(KEY('/style/background/image'), filename)
 
-    def on_opacity_value_changed(self, hscale):
-        """Changes the value of background_opacity in gconf
+    def on_transparency_value_changed(self, hscale):
+        """Changes the value of background_transparency in gconf
         """
         value = hscale.get_value()
-        self.client.set_int(KEY('/style/background/opacity'), int(value))
+        self.client.set_int(KEY('/style/background/transparency'), int(value))
 
     # compatibility tab
@@ -448 +448 @@
             self.get_widget('background_image').set_filename(value)
 
-        value = self.client.get_int(KEY('/style/background/opacity'))
-        self.get_widget('background_opacity').set_value(value)
+        value = self.client.get_int(KEY('/style/background/transparency'))
+        self.get_widget('background_transparency').set_value(value)
 
         # it's a separated method, to be reused.