Fixed the broken view menu, corrected some tabs, and removed some left
over debug code
This commit is contained in:
parent
1b89b61370
commit
9dfd4ca4ed
3 changed files with 33 additions and 37 deletions
|
|
@ -31,13 +31,6 @@ namespace gui {
|
|||
WindowManager::WindowManager()
|
||||
{
|
||||
register_stock_items();
|
||||
|
||||
g_message("get_home_dir() : %s", get_home_dir().c_str());
|
||||
g_message("get_tmp_dir() : %s", get_tmp_dir().c_str());
|
||||
g_message("get_current_dir() : %s", get_current_dir().c_str());
|
||||
g_message("get_user_data_dir() : %s", get_user_data_dir().c_str());
|
||||
g_message("get_user_config_dir() : %s", get_user_config_dir().c_str());
|
||||
g_message("get_user_cache_dir () : %s", get_user_cache_dir().c_str());
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
|||
|
|
@ -34,36 +34,36 @@
|
|||
namespace lumiera {
|
||||
namespace gui {
|
||||
|
||||
class WindowManager
|
||||
{
|
||||
public:
|
||||
WindowManager();
|
||||
class WindowManager
|
||||
{
|
||||
public:
|
||||
WindowManager();
|
||||
|
||||
bool set_theme(Glib::ustring path);
|
||||
bool set_theme(Glib::ustring path);
|
||||
|
||||
static GdkColor read_style_colour_property(
|
||||
Gtk::Widget &widget, const gchar *property_name,
|
||||
guint16 red, guint16 green, guint16 blue);
|
||||
|
||||
static GdkColor read_style_colour_property(
|
||||
Gtk::Widget &widget, const gchar *property_name,
|
||||
guint16 red, guint16 green, guint16 blue);
|
||||
|
||||
private:
|
||||
/**
|
||||
* Registers application stock items: icons and
|
||||
* labels associated with IDs */
|
||||
static void register_stock_items();
|
||||
private:
|
||||
/**
|
||||
* Registers application stock items: icons and
|
||||
* labels associated with IDs */
|
||||
static void register_stock_items();
|
||||
|
||||
static bool add_stock_item_set(
|
||||
const Glib::RefPtr<Gtk::IconFactory>& factory,
|
||||
const Glib::ustring& icon_name,
|
||||
const Glib::ustring& id,
|
||||
const Glib::ustring& label);
|
||||
|
||||
static bool add_stock_icon(Gtk::IconSet &icon_set,
|
||||
const Glib::ustring& icon_name, int size);
|
||||
|
||||
static bool add_stock_icon_source(Gtk::IconSet &icon_set,
|
||||
const Glib::ustring& base_dir,
|
||||
const Glib::ustring& icon_name, int size);
|
||||
};
|
||||
static bool add_stock_item_set(
|
||||
const Glib::RefPtr<Gtk::IconFactory>& factory,
|
||||
const Glib::ustring& icon_name,
|
||||
const Glib::ustring& id,
|
||||
const Glib::ustring& label);
|
||||
|
||||
static bool add_stock_icon(Gtk::IconSet &icon_set,
|
||||
const Glib::ustring& icon_name, int size);
|
||||
|
||||
static bool add_stock_icon_source(Gtk::IconSet &icon_set,
|
||||
const Glib::ustring& base_dir,
|
||||
const Glib::ustring& icon_name, int size);
|
||||
};
|
||||
|
||||
} // namespace gui
|
||||
} // namespace lumiera
|
||||
|
|
|
|||
|
|
@ -68,17 +68,20 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
|
|||
// View Menu
|
||||
actionGroup->add(Action::create("ViewMenu", _("_View")));
|
||||
|
||||
assetsPanelAction = ToggleAction::create("ViewAssets", Gtk::StockID("assets_panel"));
|
||||
assetsPanelAction = ToggleAction::create("ViewAssets",
|
||||
Gtk::StockID("panel_assets"));
|
||||
assetsPanelAction->signal_toggled().connect(
|
||||
sigc::mem_fun(*this, &Actions::on_menu_view_assets));
|
||||
actionGroup->add(assetsPanelAction);
|
||||
|
||||
timelinePanelAction = ToggleAction::create("ViewTimeline", Gtk::StockID("timeline_panel"));
|
||||
timelinePanelAction = ToggleAction::create("ViewTimeline",
|
||||
Gtk::StockID("panel_timeline"));
|
||||
timelinePanelAction->signal_toggled().connect(
|
||||
sigc::mem_fun(*this, &Actions::on_menu_view_timeline));
|
||||
actionGroup->add(timelinePanelAction);
|
||||
|
||||
viewerPanelAction = ToggleAction::create("ViewViewer", Gtk::StockID("viewer_panel"));
|
||||
viewerPanelAction = ToggleAction::create("ViewViewer",
|
||||
Gtk::StockID("panel_viewer"));
|
||||
viewerPanelAction->signal_toggled().connect(
|
||||
sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
|
||||
actionGroup->add(viewerPanelAction);
|
||||
|
|
|
|||
Loading…
Reference in a new issue