#include <cctype>
#include <gtkmm.h>
-#include <pbd/error.h>
-#include <pbd/touchable.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/stacktrace.h>
-
-#include <gtkmm2ext/application.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/textviewer.h>
-#include <gtkmm2ext/popup.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/window_title.h>
-#include <gtkmm2ext/actions.h>
+
+#include "pbd/error.h"
+#include "pbd/touchable.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/replace_all.h"
+
+#include "gtkmm2ext/application.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/textviewer.h"
+#include "gtkmm2ext/popup.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/window_title.h"
+#include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/activatable.h"
+#include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/gui_thread.h"
#include "i18n.h"
UI::UI (string namestr, int *argc, char ***argv)
: AbstractUI<UIRequest> (namestr)
+ , _receiver (*this)
+
{
theMain = new Main (argc, argv);
-#ifndef GTK_NEW_TOOLTIP_API
- tips = new Tooltips;
-#endif
_active = false;
which is assumed to have called this.
*/
- run_loop_thread = Thread::self();
+ run_loop_thread = Threads::Thread::self();
/* store "this" as the UI-for-thread of this thread, same argument
as for previous line.
/* attach our request source to the default main context */
- request_channel.ios()->attach (MainContext::get_default());
+ attach_request_source ();
errors = new TextViewer (800,600);
errors->text().set_editable (false);
errors->set_title (title.get_string());
errors->dismiss_button().set_name ("ErrorLogCloseButton");
- errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
+ errors->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
//load_rcfile (rcfile);
UI::~UI ()
{
+ _receiver.hangup ();
}
-
bool
UI::caller_is_ui_thread ()
{
- return Thread::self() == run_loop_thread;
+ return Threads::Thread::self() == run_loop_thread;
}
int
* This does not occur if wiget.get_style is used instead of rc.get_style below,
* except that doesn't actually work...
*/
-
+
static Glib::RefPtr<Style>* fatal_style = 0;
static Glib::RefPtr<Style>* error_style = 0;
static Glib::RefPtr<Style>* warning_style = 0;
return -1;
}
- if (access (path.c_str(), R_OK)) {
+ if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
error << "UI: couldn't find rc file \""
<< path
<< '"'
return -1;
}
- vector<string> files;
- files.push_back(path.c_str());
- RC::set_default_files(files);
- RC::reparse_all (Gtk::Settings::get_default(), true);
+ RC rc (path.c_str());
+ //this is buggy in gtkmm for some reason, so use C
+ //RC::reset_styles (Gtk::Settings::get_default());
+ gtk_rc_reset_styles (gtk_settings_get_default());
+
theme_changed.emit();
if (themechange) {
void
UI::run (Receiver &old_receiver)
{
- listen_to (error);
- listen_to (info);
- listen_to (warning);
- listen_to (fatal);
+ _receiver.listen_to (error);
+ _receiver.listen_to (info);
+ _receiver.listen_to (warning);
+ _receiver.listen_to (fatal);
/* stop the old receiver (text/console) once we hit the first idle */
Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false));
- starting ();
+ if (starting ()) {
+ return;
+ }
+
_active = true;
theMain->run ();
_active = false;
- stopping ();
- hangup ();
+
return;
}
std::string msg(tip);
Glib::RefPtr<Gtk::Action> action = w->get_action();
+
+ if (!action) {
+ Gtkmm2ext::Activatable* activatable;
+ if ((activatable = dynamic_cast<Gtkmm2ext::Activatable*>(w))) {
+ action = activatable->get_related_action();
+ }
+ }
+
if (action) {
Gtk::AccelKey key;
- ustring ap = action->get_accel_path();
- if (!ap.empty()) {
- bool has_key = ActionManager::lookup_entry(ap, key);
- if (has_key && key.get_abbrev() != "") {
- msg.append("\n\n Key: ").append(key.get_abbrev());
- }
- }
+ ustring ap = action->get_accel_path();
+ if (!ap.empty()) {
+ string shortcut = ActionManager::get_key_representation (ap, key);
+ if (!shortcut.empty()) {
+ replace_all (shortcut, "<", "");
+ replace_all (shortcut, ">", "-");
+ msg.append(_("\n\nShortcut: ")).append (shortcut);
+ }
+ }
}
if (req == 0) {
return;
}
+
req->widget = w;
req->msg = msg.c_str();
req->msg2 = hlp;
} else if (req->type == SetTip) {
-#ifdef GTK_NEW_TOOLTIP_API
- /* even if the installed GTK is up to date,
- at present (November 2008) our included
- version of gtkmm is not. so use the GTK
- API that we've verified has the right function.
- */
- gtk_widget_set_tooltip_text (req->widget->gobj(), req->msg);
-#else
- tips->set_tip (*req->widget, req->msg, "");
-#endif
+ gtk_widget_set_tooltip_markup (req->widget->gobj(), req->msg);
} else {
handle_fatal (str);
} else {
- display_message (prefix, prefix_len, ptag, mtag, str);
-
- if (!errors->is_visible() && chn != Transmitter::Info) {
- toggle_errors();
+ if (!ptag || !mtag) {
+ /* oops, message sent before we set up tags - don't crash */
+ cerr << prefix << str << endl;
+ } else {
+ display_message (prefix, prefix_len, ptag, mtag, str);
+
+ if (!errors->is_visible() && chn != Transmitter::Info) {
+ show_errors ();
+ }
}
}
errors->text().get_buffer()->end_user_action();
}
+void
+UI::show_errors ()
+{
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
+ if (!act) {
+ return;
+ }
+
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+ if (tact) {
+ tact->set_active ();
+ }
+}
+
void
UI::toggle_errors ()
{
void
UI::popup_error (const string& text)
{
- PopUp *pup;
-
if (!caller_is_ui_thread()) {
error << "non-UI threads can't use UI::popup_error"
<< endmsg;
return;
}
- pup = new PopUp (WIN_POS_MOUSE, 0, true);
- pup->set_text (text);
- pup->touch ();
+ MessageDialog msg (text);
+ msg.set_title (string_compose (_("I'm sorry %1, I can't do that"), g_get_user_name()));
+ msg.set_wmclass (X_("error"), name());
+ msg.set_position (WIN_POS_MOUSE);
+ msg.run ();
}
-
void
UI::flush_pending ()
{
}
bool
-UI::just_hide_it (GdkEventAny */*ev*/, Window *win)
+UI::just_hide_it (GdkEventAny* /*ev*/, Window *win)
{
win->hide ();
return true;
}
bool
-UI::color_selection_deleted (GdkEventAny */*ev*/)
+UI::color_selection_deleted (GdkEventAny* /*ev*/)
{
Main::quit ();
return true;
projects / ardour.git / blobdiff