[pan2] https://bugzilla.gnome.org/show_bug.cgi?id=680298
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] https://bugzilla.gnome.org/show_bug.cgi?id=680298
- Date: Sat, 21 Jul 2012 11:21:02 +0000 (UTC)
commit a3bbefc9371308fe7a437e9b3123dde286c5c55f
Author: Heinrich MÃller <henmull src gnome org>
Date: Sat Jul 21 12:00:15 2012 +0200
https://bugzilla.gnome.org/show_bug.cgi?id=680298
pan/gui/gui.cc | 9 +++++++--
pan/gui/prefs-ui.cc | 12 +++++++++++-
pan/gui/profiles-dialog.cc | 2 +-
pan/gui/task-pane.cc | 6 ++++--
pan/gui/task-pane.h | 4 ++++
pan/icons/Makefile.am | 1 +
pan/icons/icon_prefs_panes.png | Bin 0 -> 811 bytes
pan/icons/icon_refresh.png | Bin 0 -> 1307 bytes
8 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index fd94efc..d9dba10 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -2307,8 +2307,13 @@ GUI :: on_queue_error (Queue&, const StringView& message)
void
-GUI :: on_prefs_flag_changed (const StringView&, bool)
-{}
+GUI :: on_prefs_flag_changed (const StringView& key, bool val)
+{
+ if (key == "show-taskpane-popups")
+ {
+ _prefs.save();
+ }
+}
void
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 62df562..e10cb92 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -734,7 +734,6 @@ PrefsDialog :: on_prefs_flag_changed (const StringView& key, bool value)
{
_prefs.save();
}
-
}
namespace
@@ -987,6 +986,17 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
HIG :: workarea_finish (t, &row);
gtk_notebook_append_page (GTK_NOTEBOOK(notebook), t, new_label_with_icon(_("_Behavior"), _("Behavior"), icon_prefs_behavior, prefs));
+ // pane options
+ row = 0;
+ t = HIG :: workarea_create ();
+ HIG::workarea_add_section_spacer (t, row, 1);
+ HIG :: workarea_add_section_title (t, &row, _("Task Pane"));
+ w = new_check_button (_("Show Task Pane info popups"), "show-taskpane-popups", true, prefs);
+ HIG :: workarea_add_wide_control (t, &row, w);
+ HIG::workarea_add_section_divider (t, &row);
+ HIG :: workarea_finish (t, &row);
+ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), t, new_label_with_icon(_("_Panes"), _("Panes"), icon_prefs_panes, prefs));
+
//charset
row = 0;
t = HIG :: workarea_create ();
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index d41db0a..d766b10 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -80,7 +80,7 @@ namespace
if (row == ROW_GPGSIG)
{
gtk_widget_set_tooltip_text(d->_signature_file_combo_box,
- _("Please choose your email address according to your PGP key's user id."));
+ _("Please choose your email address according to your PGP key's user id."));
gtk_widget_hide (d->_signature_file);
}
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index 4f3c8b3..dd63115 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -113,6 +113,8 @@ TaskPane:: on_tooltip_query(GtkWidget *widget,
{
TaskPane* tp(static_cast<TaskPane*>(data));
+ if (!tp->get_prefs().get_flag("show-taskpane-popups", true)) return false;
+
gtk_tooltip_set_icon_from_stock (tooltip, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
GtkTreeIter iter;
@@ -153,9 +155,9 @@ TaskPane:: on_tooltip_query(GtkWidget *widget,
date = date_maker.get_date_string (ta->get_article().time_posted);
g_snprintf(buffer,sizeof(buffer),
_("\n<u>Download</u>\n\n<i>Subject:</i> <b>\"%s\"</b>\n<i>From:</i> <b>%s</b>\n<i>Date:</i> <b>%s</b>\n"
- "<i>Groups:</i> <b>%s</b>\n<i>Save Path:</i> <b>%s</b>\nPaused: %d"),
+ "<i>Groups:</i> <b>%s</b>\n<i>Save Path:</i><b>%s</b>\n"),
a.subject.to_string().c_str(), escaped(a.author.to_string()).c_str(), date ? date : _("unknown"),
- ta->get_groups().c_str(), ta->get_save_path().to_string().c_str(), ta->start_paused());
+ ta->get_groups().c_str(), ta->get_save_path().to_string().c_str());
}
task_found = tu || ta;
diff --git a/pan/gui/task-pane.h b/pan/gui/task-pane.h
index 943aa5c..b638636 100644
--- a/pan/gui/task-pane.h
+++ b/pan/gui/task-pane.h
@@ -74,6 +74,10 @@ namespace pan
bool _dampen_move_feedback_loop;
GtkUIManager * _uim;
GtkActionGroup * _pgroup;
+
+ public:
+ Prefs& get_prefs() { return _prefs; }
+
private:
std::string prompt_user_for_new_dest (GtkWindow * parent, const Quark& current_path);
diff --git a/pan/icons/Makefile.am b/pan/icons/Makefile.am
index 5e4e19d..e522c92 100644
--- a/pan/icons/Makefile.am
+++ b/pan/icons/Makefile.am
@@ -66,6 +66,7 @@ stock_images = \
icon_prefs_headers.png \
icon_prefs_layout.png \
icon_prefs_actions.png \
+ icon_prefs_panes.png \
icon_expand_thread.png \
icon_collapse_thread.png
diff --git a/pan/icons/icon_prefs_panes.png b/pan/icons/icon_prefs_panes.png
new file mode 100644
index 0000000..75f2c63
Binary files /dev/null and b/pan/icons/icon_prefs_panes.png differ
diff --git a/pan/icons/icon_refresh.png b/pan/icons/icon_refresh.png
new file mode 100644
index 0000000..ce42c12
Binary files /dev/null and b/pan/icons/icon_refresh.png differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]