[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r981 - in
From:       codesite-noreply () google ! com
Date:       2008-02-01 0:02:10
Message-ID: 000e0cd32c2404450d7c5bce4b12d553 () google ! com
[Download RAW message or body]

Author: KillerKiwi2005
Date: Thu Jan 31 16:01:06 2008
New Revision: 981

Modified:
   trunk/client/trunk/klikclient/lib/klik/execute.py
   trunk/client/trunk/klikclient/lib/klik/fuse.py
   trunk/client/trunk/klikclient/lib/klik/gtk/about.py
   trunk/client/trunk/klikclient/lib/klik/gtk/create.py
   trunk/client/trunk/klikclient/lib/klik/utils/xdg.py
   trunk/client/trunk/klikclient/share/klik/klik.glade

Log:
Lots of gtk fixs

Modified: trunk/client/trunk/klikclient/lib/klik/execute.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/execute.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/execute.py	Thu Jan 31 
16:01:06 2008
@@ -193,8 +193,13 @@
 			error_text = error_log.read()
 			error_log.close()

-		return p.returncode, error_text
+		result = p.returncode
 		
+		# Patch for our feedback, we dont want X window kills reported as fail
+		if result == 1 and error_text.strip().startswith("X connection to") 
> -1:
+			result = 0
+
+		return result, error_text
 		
 	# Execute should always be the same, regardless of mount type (hopefully)
 	def check_for_missing_library(self, command, cmg_path):

Modified: trunk/client/trunk/klikclient/lib/klik/fuse.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/fuse.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/fuse.py	Thu Jan 31 16:01:06 2008
@@ -35,7 +35,7 @@

 		# Add read/write redirects
 		if jail_path != None:
-			command = command + ["-B", jail_path]
+			command = command + ["-d", jail_path]

 		# Append paths
 		command = command + ["-p", cmg_path, mount_point_path, "-s"]

Modified: trunk/client/trunk/klikclient/lib/klik/gtk/about.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/gtk/about.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/gtk/about.py	Thu Jan 31 
16:01:06 2008
@@ -1,5 +1,6 @@
 import gtk
 import subprocess
+import os

 class KlikAbout(object):

@@ -12,10 +13,10 @@
 	def show(self):
 		dlg = gtk.AboutDialog()
 		gtk.about_dialog_set_url_hook(self.on_url, None)
-		dlg.set_version("1.9.0.XXX") # fixme (get this from proper location)
+		dlg.set_version(self.klik.settings.version) # fixme (get this from 
proper location)
 		dlg.set_name("klik")
-		icon = 
gtk.icon_theme_get_default().load_icon("application-x-extension-cmg", 
48, 0)
-		#gtk.gdk.pixbuf_new_from_file("/usr/share/klik/klik-window.png") # 
fixme, use  gtk.window_set_default_icon_list()
+		#icon = 
gtk.icon_theme_get_default().load_icon("application-x-extension-cmg", 
48, 0)
+		icon = 
gtk.gdk.pixbuf_new_from_file(os.path.join(self.klik.sys_path , 
os.pardir, "share", "klik", "klik-window.png")) # fixme, use  \
gtk.window_set_default_icon_list()  dlg.set_logo(icon)
  		dlg.set_authors(["Simon Peter <probono@myrealbox.com>", "Kurt 
Pfeifle <pfeifle@kde.org>", "Jason Taylor 
<killerkiwi2005@gmail.com>", "Lionel Tricon 
<lionel.tricon@free.fr>", "Niall Walsh <niallw@gmail.com>","RazZziel 
<razielmine@gmail.com","","Thanks to all testers and contributors","in 
#klik on irc.freenode.net"])
 		dlg.set_documenters(["Kurt Pfeifle <pfeifle@kde.org>"])
@@ -23,10 +24,9 @@
  		dlg.set_comments('''Download and run software\n virtualized without 
installation\nusing compressed application images\n\nFor help, please 
visit\n#klik on irc.freenode.net''')
 		def close(w, res):
 			if res == gtk.RESPONSE_CANCEL:
-				w.hide()
+				w.destroy()
 		dlg.connect("response", close)
-		dlg.run()
-		return dlg
+		dlg.show()
 	
 if __name__ == "__main__":
 	ka = KlikAbout(None)

Modified: trunk/client/trunk/klikclient/lib/klik/gtk/create.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/gtk/create.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/gtk/create.py	Thu Jan 31 
16:01:06 2008
@@ -24,9 +24,9 @@
 from klik.utils.xdg import XdgUtils
 from klik.exception import SafeException
 from klik.exception import ExecuteException
+from about import KlikAbout

 #http://aruiz.typepad.com/siliconisland/2006/04/index.html
-
 def threaded(f):
 	def wrapper(*args):
 		t = threading.Thread(target=f, args=args)
@@ -66,8 +66,7 @@
 			"on_button_run_clicked"        : self.on_button_run_clicked
 		}
 		self.create.wtree.signal_autoconnect(dic)
-
-
+		
 	def setup(self):
  		self.image_application_icon.set_from_file( 
os.path.join(self.create.klik.sys_path , 
os.pardir, "share", "klik", "klik.png") )

@@ -84,6 +83,8 @@
 		if self.create.recipe.size != None:
 			self.label_size.set_text( self.create.recipe.size )

+		self.window.set_title("klik - " + self.create.recipe.name)
+
 		buf = self.textview_sources.get_buffer()
 		buf.create_tag("bold", weight = pango.WEIGHT_BOLD)
 		buf.create_tag("indent", indent = 12)
@@ -136,8 +137,10 @@
 		self.textview_user_comment = self.create.wtree.get_widget("textview_user_comment")
 		
 		dic = {
-			"on_button_send_clicked"     : self.on_button_send_clicked,
-			"on_button_cancel_clicked"   : self.on_cancel
+			"on_dialog_feedback_destroy"		: self.on_cancel,
+			"on_button_send_clicked"		: self.on_button_send_clicked,
+			"on_button_cancel_feedback_clicked"	: self.on_cancel,
+			"on_button_about_clicked"		: self.on_button_about_clicked
 		}
 		self.create.wtree.signal_autoconnect(dic)
 		
@@ -146,7 +149,11 @@
 		self.error_text = ""
 		self.lib_report = ""

-	def update_display(self, recipe, result, error_text, lib_report):
+	def on_button_about_clicked(self, widget):
+		ka = KlikAbout(self.create.klik)
+		ka.show()
+
+	def update_display(self, recipe, result, error_text, lib_report):		
  		self.label_title.set_label("<span size='larger' 
weight='bold'>%s</span>" % recipe.name)
 		self.radiobutton_yes.set_active(result == 0)
 		self.radiobutton_no.set_active(result != 0)
@@ -162,6 +169,8 @@
 		
 		self.error_text = error_text
 		self.lib_report = lib_report
+		
+		self.window.set_title("klik - " + recipe.name)

 	def on_button_send_clicked(self, widget):
 		self.start_postback()
@@ -187,7 +196,7 @@
 		gtk.main_quit()

 	def on_cancel(self, widget):
-		gtk.main_quit()
+		self.create.quit()

  class ProgressDialog (object): # Dialog that is shown while recipe is 
being downloaded

@@ -212,13 +221,18 @@
 		self.progressbar.set_pulse_step(0.05)

 		dic = {
-			"on_button_cancel_progress_clicked"     : self.on_cancel
+			"on_button_cancel_progress_clicked"     : self.on_cancel,
+			"on_progress_expander_detail_activate"	: \
self.on_progress_expander_detail_activate  }
 		self.create.wtree.signal_autoconnect(dic)

 		# Change the color of the progress window details pane
 		self.textview_detail.modify_base(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0));
 		self.textview_detail.modify_text(gtk.STATE_NORMAL, \
gtk.gdk.Color(65535,65535,65535)); +
+	def on_progress_expander_detail_activate(self, widget):
+		return
+

 	def add_details_line(self, text):
 		gtk.gdk.threads_enter()

Modified: trunk/client/trunk/klikclient/lib/klik/utils/xdg.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/utils/xdg.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/utils/xdg.py	Thu Jan 31 
16:01:06 2008
@@ -288,8 +288,6 @@
  		if len(Popen(["ls","/usr/lib/libqt*.so.4"], shell=True, stdout=PIPE, 
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
 			result.append("QT4")
 		
-		
-		
  		if len(Popen(["which", "mono"], stdout=PIPE, 
stderr=open(os.devnull, "w")).communicate()[0].strip().replace("\n", ", ")) 
> 0:
 			result.append("MONO")
 		

Modified: trunk/client/trunk/klikclient/share/klik/klik.glade
==============================================================================
--- trunk/client/trunk/klikclient/share/klik/klik.glade	(original)
+++ trunk/client/trunk/klikclient/share/klik/klik.glade	Thu Jan 31 
16:01:06 2008
@@ -5,6 +5,7 @@
   <widget class="GtkDialog" id="download_prompt">
     <property name="border_width">6</property>
     <property name="title">klik</property>
+    <property name="resizable">False</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
     <property name="icon_name">gtk-save</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -163,91 +164,6 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label22">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;Signed By:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label_signature">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" \
                translatable="yes">&lt;b&gt;unsigned&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                            <property name="wrap">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" \
                translatable="yes">&lt;b&gt;Summary:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label6">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" \
                translatable="yes">&lt;b&gt;Version:&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label_summary">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" \
                translatable="yes">unknown</property>
-                            <property name="wrap">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label_version">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" \
                translatable="yes">unknown</property>
-                            <property name="wrap">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
                           <widget class="GtkAlignment" id="alignment4">
                             <property name="visible">True</property>
                             <property name="top_padding">12</property>
@@ -383,6 +299,91 @@
                             <property name="bottom_attach">4</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkLabel" id="label_version">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" \
translatable="yes">unknown</property> +                            <property \
name="wrap">True</property> +                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label_summary">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" \
translatable="yes">unknown</property> +                            <property \
name="wrap">True</property> +                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label6">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" \
translatable="yes">&lt;b&gt;Version:&lt;/b&gt;</property> +                           \
<property name="use_markup">True</property> +                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" \
translatable="yes">&lt;b&gt;Summary:&lt;/b&gt;</property> +                           \
<property name="use_markup">True</property> +                          </widget>
+                          <packing>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label_signature">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" \
translatable="yes">&lt;b&gt;unsigned&lt;/b&gt;</property> +                           \
<property name="use_markup">True</property> +                            <property \
name="wrap">True</property> +                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label22">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" 
translatable="yes">&lt;b&gt;Signed By:&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                     <child>
@@ -431,7 +432,6 @@
               <widget class="GtkButton" id="button_cancel">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="label">gtk-cancel</property>
@@ -506,6 +506,7 @@
     <property name="icon_name">gtk-dialog-question</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
+    <signal name="destroy" handler="on_dialog_feedback_destroy"/>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
@@ -647,7 +648,6 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="padding">8</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -759,6 +759,7 @@
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
                           <widget class="GtkTextView" id="textview_error_report">
+                            <property name="height_request">100</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                              <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -853,6 +854,7 @@
                 </child>
               </widget>
               <packing>
+                <property name="padding">8</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -882,19 +884,35 @@
               <widget class="GtkButton" id="button_cancel">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
                 <property name="response_id">-6</property>
-                <signal name="clicked" handler="on_button_cancel_clicked"/>
+                <signal name="clicked" handler="on_button_cancel_feedback_clicked"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="button_about">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK</property> +                <property name="label" \
translatable="yes">gtk-about</property> +                <property \
name="use_stock">True</property> +                <property \
name="response_id">0</property> +                <signal name="clicked" \
handler="on_button_about_clicked"/>  </widget>
+              <packing>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_send">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
+                <property name="is_focus">True</property>
+                <property name="can_default">True</property>
                 <property name="response_id">-5</property>
                 <signal name="clicked" handler="on_button_send_clicked"/>
                 <child>
@@ -935,23 +953,7 @@
                 </child>
               </widget>
               <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_about">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | \
                GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-about</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_about_clicked"/>
-              </widget>
-              <packing>
                 <property name="position">2</property>
-                <property name="secondary">True</property>
               </packing>
             </child>
           </widget>
@@ -967,6 +969,8 @@
      <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK</property>  <property name="border_width">5</property>
     <property name="title" translatable="yes">Klik</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="icon_name">gtk-save</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -1036,6 +1040,7 @@
         <child>
           <widget class="GtkExpander" id="expander_detail">
             <property name="can_focus">True</property>
+            <property name="resize_mode">GTK_RESIZE_IMMEDIATE</property>
             <child>
               <widget class="GtkScrolledWindow" id="scrolledwindow7">
                 <property name="visible">True</property>
@@ -1044,6 +1049,8 @@
                 <property name="shadow_type">GTK_SHADOW_IN</property>
                 <child>
                   <widget class="GtkTextView" id="textview_detail">
+                    <property name="width_request">500</property>
+                    <property name="height_request">300</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                      <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK</property> @@ -1160,21 +1167,72 @@
             </child>
             <child>
               <widget class="GtkExpander" id="expander2">
+                <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <widget class="GtkCheckButton" id="checkbox_run_in_jail">
+                  <widget class="GtkVBox" id="vbox13">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Run 
application in a jail</property>
-                    <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK</property> +                    <property \
name="spacing">4</property> +                    <child>
+                      <widget class="GtkRadioButton" id="radiobutton1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">None</property>
+                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="radiobutton2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">System</property>
+                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="radiobutton3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Home \
Folder</property> +                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="radiobutton4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" 
translatable="yes">Application Settings</property>
+                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </widget>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="label7">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Advanced \
Options</property> +                    <property name="label" \
translatable="yes">Sandbox Options</property>  </widget>
                   <packing>
                     <property name="type">label_item</property>
@@ -1197,6 +1255,21 @@
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
+              <widget class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK</property> +                <property name="label" \
translatable="yes">gtk-about</property> +                <property \
name="use_stock">True</property> +                <property \
name="response_id">0</property> +                <signal name="clicked" \
handler="on_button1_clicked"/> +              </widget>
+              <packing>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+            <child>
               <widget class="GtkButton" id="button_close">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1205,6 +1278,9 @@
                 <property name="response_id">0</property>
                 <signal name="clicked" handler="on_button_close_clicked"/>
               </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button_ok">
@@ -1237,7 +1313,7 @@
                 </child>
               </widget>
               <packing>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </widget>
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic