summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-29 11:40:52 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-01-29 11:40:52 +0100
commitf76e83a75e4408e2f8e72fd7aade74d78b2c1de0 (patch)
treec1b4374e7936cf3587998f86e454f3cf2b972239 /src
parentac4aeefa6ab847fed4719f5145383c80ec552653 (diff)
parent72738e39feba56d846e970cdcc92d2d46ffa60a9 (diff)
downloadabrt-f76e83a75e4408e2f8e72fd7aade74d78b2c1de0.tar.gz
abrt-f76e83a75e4408e2f8e72fd7aade74d78b2c1de0.tar.xz
abrt-f76e83a75e4408e2f8e72fd7aade74d78b2c1de0.zip
Merge branch 'master' into rhel6
Diffstat (limited to 'src')
-rw-r--r--src/Gui/CCReporterDialog.py11
-rw-r--r--src/Gui/abrt_utils.py5
-rw-r--r--src/Gui/report.glade2
3 files changed, 15 insertions, 3 deletions
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 74cf37e4..a04725bd 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pygtk
pygtk.require("2.0")
-import gtk #, pango
+import gtk
import gtk.glade
import pango
import sys
@@ -12,7 +12,7 @@ from PluginSettingsUI import PluginSettingsUI
from PluginList import getPluginInfoList
#from CCDumpList import getDumpList, DumpList
from CCDump import * # FILENAME_xxx, CD_xxx
-from abrt_utils import _, log, log1, log2
+from abrt_utils import _, log, log1, log2, get_verbose_level, g_verbose
# FIXME - create method or smth that returns type|editable|content
@@ -51,7 +51,12 @@ class ReporterDialog():
self.tevHowToReproduce = self.builder.get_object("tevHowToReproduce")
self.builder.get_object("fErrors").hide()
- self.builder.get_object("bLog").connect("clicked", self.show_log_cb, log)
+ bLog = self.builder.get_object("bLog")
+ #if g_verbose > 0: - doesn't work! why?!
+ if get_verbose_level() > 0:
+ bLog.connect("clicked", self.show_log_cb, log)
+ else:
+ bLog.unset_flags(gtk.VISIBLE)
self.builder.get_object("cbSendBacktrace").connect("toggled", self.on_send_backtrace_toggled)
self.allow_send()
self.hydrate()
diff --git a/src/Gui/abrt_utils.py b/src/Gui/abrt_utils.py
index 3b0bb79a..13ef499f 100644
--- a/src/Gui/abrt_utils.py
+++ b/src/Gui/abrt_utils.py
@@ -25,6 +25,11 @@ def init_logging(progname, v):
gtk.glade.textdomain(PROGNAME)
gettext.textdomain(PROGNAME)
+def get_verbose_level():
+ # Just importing g_verbose from another module doesn't work (why!?),
+ # need to use a function
+ return g_verbose
+
def log(fmt, *args):
sys.stderr.write("%s: %s\n" % (PROGNAME, fmt % args))
diff --git a/src/Gui/report.glade b/src/Gui/report.glade
index ff375f75..157c622a 100644
--- a/src/Gui/report.glade
+++ b/src/Gui/report.glade
@@ -268,6 +268,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
@@ -591,6 +592,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>