From 5dc43e9595943ab5a1e8045ced5f6040f94e1180 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Thu, 26 Feb 2009 16:28:57 +0100
Subject: Fixed cancel button in reporter

---
 src/Gui/CCDump.py           |   1 +
 src/Gui/CCDumpList.py       |   2 +-
 src/Gui/CCMainWindow.py     |   3 +-
 src/Gui/CCReporterDialog.py |  13 ++----
 src/Gui/ccgui.glade         | 100 ++++++++++++++++++++++----------------------
 5 files changed, 58 insertions(+), 61 deletions(-)

(limited to 'src')

diff --git a/src/Gui/CCDump.py b/src/Gui/CCDump.py
index 87474e9..5e2e651 100644
--- a/src/Gui/CCDump.py
+++ b/src/Gui/CCDump.py
@@ -9,6 +9,7 @@ class Dump():
         self.Executable = None
         self.Package = None
         self.Time = None
+        self.Description = None
     
     def getUUID(self):
         return self.UUID
diff --git a/src/Gui/CCDumpList.py b/src/Gui/CCDumpList.py
index 25e12af..5aaae92 100644
--- a/src/Gui/CCDumpList.py
+++ b/src/Gui/CCDumpList.py
@@ -8,7 +8,7 @@ class DumpList(list):
     
     def load(self):
         if self.dm:
-            print "loading DumpList"
+            #print "loading DumpList"
             try:
                 rows = self.dm.getDumps()
                 #print rows
diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index 0cbd03e..ab2e171 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -130,6 +130,7 @@ class MainWindow():
             report = self.ccdaemon.getReport(dump.getUUID())
         except Exception,e:
             # FIXME #3	dbus.exceptions.DBusException: org.freedesktop.DBus.Error.NoReply: Did not receive a reply
+            # do this async and wait for yum to end with debuginfoinstal
             gui_error_message("Operation taking too long - \nPlease try again after debuginfo is installed")
             return
             
@@ -138,7 +139,7 @@ class MainWindow():
             return
         report_dialog = ReporterDialog(report)
         result = report_dialog.run()
-        if result == -1:
+        if result == gtk.RESPONSE_CANCEL:
             pass
         else:
             self.ccdaemon.Report(result)
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index f9bb493..2affead 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -39,8 +39,8 @@ class ReporterDialog():
         renderer.connect('edited',self.column_edited,self.reportListStore)
         
         # connect the signals
-        self.wTree.get_widget("bApply").connect("clicked", self.on_apply_clicked, self.tvReport)
-        self.wTree.get_widget("bCancel").connect("clicked", self.on_cancel_clicked, self.tvReport)
+        #self.wTree.get_widget("bApply").connect("clicked", self.on_apply_clicked, self.tvReport)
+        #self.wTree.get_widget("bCancel").connect("clicked", self.on_cancel_clicked, self.tvReport)
         
         self.hydrate()
 
@@ -50,15 +50,10 @@ class ReporterDialog():
         return
         
     def on_apply_clicked(self, button, treeview):
-        #print treeview
-        #self.window.destroy();
-        print self.report
-        return self.report
+        pass
         
     def on_cancel_clicked(self, button, treeview):
-        #print treeview
-        #self.window.destroy();
-        return gtk.RESPONSE_CANCEL
+        pass
     
     def hydrate(self):
         editable = ["Comment", "TextData1", "TextData2"]
diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade
index fadb605..b2f2ea2 100644
--- a/src/Gui/ccgui.glade
+++ b/src/Gui/ccgui.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Feb 24 14:18:21 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Feb 26 16:15:05 2009 -->
 <glade-interface>
   <widget class="GtkWindow" id="main_window">
     <property name="default_width">640</property>
@@ -396,7 +396,7 @@
                 <property name="receives_default">True</property>
                 <property name="label" translatable="yes">gtk-apply</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
+                <property name="response_id">-10</property>
               </widget>
             </child>
             <child>
@@ -406,7 +406,7 @@
                 <property name="receives_default">True</property>
                 <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
+                <property name="response_id">-6</property>
               </widget>
               <packing>
                 <property name="position">1</property>
@@ -458,53 +458,6 @@
                 <child>
                   <placeholder/>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label14">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">BlackList</property>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkEntry" id="entry1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label15">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Database Plugin</property>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkComboBox" id="combobox1">
-                    <property name="visible">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>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label16">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">OpenPGP Public Keys</property>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                  </packing>
-                </child>
                 <child>
                   <widget class="GtkHBox" id="hbox7">
                     <property name="visible">True</property>
@@ -553,6 +506,53 @@
                     <property name="bottom_attach">3</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="GtkLabel" id="label16">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">OpenPGP Public Keys</property>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBox" id="combobox1">
+                    <property name="visible">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>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label15">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Database Plugin</property>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entry1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label14">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">BlackList</property>
+                  </widget>
+                </child>
               </widget>
             </child>
             <child>
-- 
cgit