Commit a6152477 authored by Jim Krehl's avatar Jim Krehl
Browse files

svn path=/branches/version-2/; revision=156



svn path=/branches/version-2/; revision=156
parent 0f177a40
......@@ -64,7 +64,7 @@ typedef struct {
GladeXML *main_menu_xml;
GladeXML *panel_button_xml;
GtkWidget *panel_buttons [3];
GtkWidget *panel_buttons [4];
GtkWidget *panel_button;
GtkWidget *slab_window;
......@@ -178,6 +178,7 @@ enum {
enum {
PANEL_BUTTON_ORIENT_TOP,
PANEL_BUTTON_ORIENT_BOTTOM,
PANEL_BUTTON_ORIENT_LEFT,
PANEL_BUTTON_ORIENT_RIGHT
};
......@@ -235,46 +236,47 @@ main_menu_ui_init (MainMenuUI *this)
{
MainMenuUIPrivate *priv = PRIVATE (this);
priv->panel_applet = NULL;
priv->panel_about_dialog = NULL;
priv->panel_applet = NULL;
priv->panel_about_dialog = NULL;
priv->main_menu_xml = NULL;
priv->panel_button_xml = NULL;
priv->main_menu_xml = NULL;
priv->panel_button_xml = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = NULL;
priv->panel_button = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = NULL;
priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = NULL;
priv->panel_button = NULL;
priv->slab_window = NULL;
priv->slab_window = NULL;
priv->top_pane = NULL;
priv->left_pane = NULL;
priv->top_pane = NULL;
priv->left_pane = NULL;
priv->search_section = NULL;
priv->search_entry = NULL;
priv->search_section = NULL;
priv->search_entry = NULL;
priv->file_section = NULL;
priv->apps_selector = NULL;
priv->docs_selector = NULL;
priv->dirs_selector = NULL;
priv->file_section = NULL;
priv->apps_selector = NULL;
priv->docs_selector = NULL;
priv->dirs_selector = NULL;
priv->sys_table = NULL;
priv->usr_apps_table = NULL;
priv->rct_apps_table = NULL;
priv->usr_docs_table = NULL;
priv->rct_docs_table = NULL;
priv->usr_dirs_table = NULL;
priv->sys_table = NULL;
priv->usr_apps_table = NULL;
priv->rct_apps_table = NULL;
priv->usr_docs_table = NULL;
priv->rct_docs_table = NULL;
priv->usr_dirs_table = NULL;
priv->more_button [MORE_APPS_BUTTON] = NULL;
priv->more_button [MORE_DOCS_BUTTON] = NULL;
priv->more_button [MORE_DIRS_BUTTON] = NULL;
priv->more_button [MORE_APPS_BUTTON] = NULL;
priv->more_button [MORE_DOCS_BUTTON] = NULL;
priv->more_button [MORE_DIRS_BUTTON] = NULL;
priv->max_total_items = 8;
priv->max_total_items = 8;
priv->search_cmd_gconf_mntr_id = 0;
priv->ptr_is_grabbed = FALSE;
priv->kbd_is_grabbed = FALSE;
priv->search_cmd_gconf_mntr_id = 0;
priv->ptr_is_grabbed = FALSE;
priv->kbd_is_grabbed = FALSE;
}
static void
......@@ -285,7 +287,7 @@ main_menu_ui_finalize (GObject *g_obj)
gint i;
for (i = 0; i < 3; ++i) {
for (i = 0; i < 4; ++i) {
g_object_unref (G_OBJECT (g_object_get_data (
G_OBJECT (priv->more_button [i]), "double-click-detector")));
......@@ -318,12 +320,14 @@ create_panel_button (MainMenuUI *this)
priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = glade_xml_get_widget (
priv->panel_button_xml, "slab-main-menu-panel-button-top");
priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = glade_xml_get_widget (
priv->panel_button_xml, "slab-main-menu-panel-button-bottom");
priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = glade_xml_get_widget (
priv->panel_button_xml, "slab-main-menu-panel-button-left");
priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = glade_xml_get_widget (
priv->panel_button_xml, "slab-main-menu-panel-button-right");
for (i = 0; i < 3; ++i) {
for (i = 0; i < 4; ++i) {
g_object_set_data (
G_OBJECT (priv->panel_buttons [i]), "double-click-detector",
double_click_detector_new ());
......@@ -894,6 +898,10 @@ reorient_panel_button (MainMenuUI *this)
priv->panel_button = priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT];
break;
case PANEL_APPLET_ORIENT_UP:
priv->panel_button = priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM];
break;
default:
priv->panel_button = priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP];
break;
......
......@@ -1220,6 +1220,86 @@
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment25">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkToggleButton" id="slab-main-menu-panel-button-bottom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<child>
<widget class="GtkHBox" id="hbox43">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkImage" id="image44">
<property name="visible">True</property>
<property name="icon_size">1</property>
<property name="icon_name">gnome-fs-client</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label96">
<property name="visible">True</property>
<property name="label" translatable="yes">Computer</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child>
</widget>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment