projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port cairo ARGB/BGRA -> pixbuf RGBA patch from recent 2.X commit (restores text on...
[ardour.git]
/
gtk2_ardour
/
theme_manager.h
diff --git
a/gtk2_ardour/theme_manager.h
b/gtk2_ardour/theme_manager.h
index a8a70b6c9a860c696d54e7d1ac6f707c600a6bd1..6e4adc57a078980e35e911ce45efeaa4190abdbc 100644
(file)
--- a/
gtk2_ardour/theme_manager.h
+++ b/
gtk2_ardour/theme_manager.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000-2007 Paul Davis
+ Copyright (C) 2000-2007 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,10
+25,10
@@
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/colorselection.h>
#include <gtkmm/radiobutton.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/colorselection.h>
#include <gtkmm/radiobutton.h>
+#include <gtkmm/button.h>
#include <gtkmm/rc.h>
#include <gtkmm/rc.h>
-#include <ardour/configuration.h>
#include "ardour_dialog.h"
#include "ardour_dialog.h"
-
+#include "ui_config.h"
class ThemeManager : public ArdourDialog
{
class ThemeManager : public ArdourDialog
{
@@
-37,23
+37,26
@@
class ThemeManager : public ArdourDialog
~ThemeManager();
int save (std::string path);
~ThemeManager();
int save (std::string path);
- void load_rc (int which);
void setup_theme ();
void setup_theme ();
+ void reset_canvas_colors();
+
+ void on_dark_theme_button_toggled ();
+ void on_light_theme_button_toggled ();
private:
struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
private:
struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
- ColorDisplayModelColumns() {
+ ColorDisplayModelColumns() {
add (name);
add (color);
add (gdkcolor);
add (pVar);
add (rgba);
}
add (name);
add (color);
add (gdkcolor);
add (pVar);
add (rgba);
}
-
- Gtk::TreeModelColumn<
Glib::u
string> name;
- Gtk::TreeModelColumn<
Glib::u
string> color;
+
+ Gtk::TreeModelColumn<
std::
string> name;
+ Gtk::TreeModelColumn<
std::
string> color;
Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
- Gtk::TreeModelColumn<
ARDOUR::
ConfigVariable<uint32_t> *> pVar;
+ Gtk::TreeModelColumn<
UI
ConfigVariable<uint32_t> *> pVar;
Gtk::TreeModelColumn<uint32_t> rgba;
};
Gtk::TreeModelColumn<uint32_t> rgba;
};
@@
-65,10
+68,10
@@
class ThemeManager : public ArdourDialog
Gtk::HBox theme_selection_hbox;
Gtk::RadioButton dark_button;
Gtk::RadioButton light_button;
Gtk::HBox theme_selection_hbox;
Gtk::RadioButton dark_button;
Gtk::RadioButton light_button;
+ Gtk::Button reset_button;
bool button_press_event (GdkEventButton*);
};
bool button_press_event (GdkEventButton*);
};
-
#endif /* __ardour_gtk_color_manager_h__ */
#endif /* __ardour_gtk_color_manager_h__ */