[Initng-svn] r2733 - in under_construction/initconf: . src
svn at initng.thinktux.net
svn at initng.thinktux.net
Thu Jan 5 15:28:23 CET 2006
Author: danne
Date: Thu Jan 5 15:28:22 2006
New Revision: 2733
Modified:
under_construction/initconf/initconf.glade
under_construction/initconf/src/callbacks.c
under_construction/initconf/src/interface.c
under_construction/initconf/src/interface.h
under_construction/initconf/src/rlparser.c
under_construction/initconf/src/rlparser.h
Log:
It's getting better for every commit...
Modified: under_construction/initconf/initconf.glade
==============================================================================
--- under_construction/initconf/initconf.glade (original)
+++ under_construction/initconf/initconf.glade Thu Jan 5 15:28:22 2006
@@ -318,7 +318,7 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
- <property name="hover_selection">True</property>
+ <property name="hover_selection">False</property>
<property name="hover_expand">False</property>
</widget>
</child>
@@ -351,7 +351,7 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
- <property name="hover_selection">True</property>
+ <property name="hover_selection">False</property>
<property name="hover_expand">False</property>
</widget>
</child>
@@ -428,82 +428,4 @@
<property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
</widget>
-<widget class="GtkDialog" id="initconf_notimplemented">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Initconf message</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="okbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- <signal name="clicked" handler="on_okbutton1_clicked" last_modification_time="Thu, 05 Jan 2006 10:46:04 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="NotImplementedLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">This feature is not yet implemented!</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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>
-
</glade-interface>
Modified: under_construction/initconf/src/callbacks.c
==============================================================================
--- under_construction/initconf/src/callbacks.c (original)
+++ under_construction/initconf/src/callbacks.c Thu Jan 5 15:28:22 2006
@@ -13,10 +13,7 @@
on_save1_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkWidget *notimplemented;
-
- notimplemented = create_initconf_notimplemented();
- gtk_widget_show(notimplemented);
+ gnome_appbar_push(GNOME_APPBAR(lookup_widget(GTK_WIDGET(menuitem), "appbar1")), "This function is not yet implemented!");
}
@@ -32,10 +29,7 @@
on_properties1_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkWidget *notimplemented;
-
- notimplemented = create_initconf_notimplemented();
- gtk_widget_show(notimplemented);
+ gnome_appbar_push(GNOME_APPBAR(lookup_widget(GTK_WIDGET(menuitem), "appbar1")), "This function is not yet implemented!");
}
@@ -43,10 +37,7 @@
on_preferences1_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkWidget *notimplemented;
-
- notimplemented = create_initconf_notimplemented();
- gtk_widget_show(notimplemented);
+ gnome_appbar_push(GNOME_APPBAR(lookup_widget(GTK_WIDGET(menuitem), "appbar1")), "This function is not yet implemented!");
}
@@ -54,10 +45,7 @@
on_about1_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkWidget *about;
-
- about = create_initconf_about();
- gtk_widget_show(about);
+ gnome_appbar_push(GNOME_APPBAR(lookup_widget(GTK_WIDGET(menuitem), "appbar1")), "This function is not yet implemented!");
}
@@ -65,10 +53,7 @@
on_save_button_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- GtkWidget *notimplemented;
-
- notimplemented = create_initconf_notimplemented();
- gtk_widget_show(notimplemented);
+ gnome_appbar_push(GNOME_APPBAR(lookup_widget(GTK_WIDGET(toolbutton), "appbar1")), "This function is not yet implemented!");
}
@@ -83,10 +68,7 @@
on_refresh_button_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- GtkWidget *notimplemented;
-
- notimplemented = create_initconf_notimplemented();
- gtk_widget_show(notimplemented);
+ gnome_appbar_push(GNOME_APPBAR(lookup_widget(GTK_WIDGET(toolbutton), "appbar1")), "This function is not yet implemented!");
}
@@ -112,10 +94,7 @@
on_AddButton_clicked (GtkButton *button,
gpointer user_data)
{
- GtkWidget *notimplemented;
-
- notimplemented = create_initconf_notimplemented();
- gtk_widget_show(notimplemented);
+ add_to_rl(button);
}
@@ -125,14 +104,3 @@
{
remove_from_rl(button);
}
-
-
-void
-on_okbutton1_clicked (GtkButton *button,
- gpointer user_data)
-{
- GtkWidget *notimplemented;
- notimplemented = lookup_widget(GTK_WIDGET(button), "initconf_notimplemented");
- gtk_widget_hide(notimplemented);
-}
-
Modified: under_construction/initconf/src/interface.c
==============================================================================
--- under_construction/initconf/src/interface.c (original)
+++ under_construction/initconf/src/interface.c Thu Jan 5 15:28:22 2006
@@ -155,7 +155,6 @@
gtk_container_add (GTK_CONTAINER (scrolledwindow1), servicelist);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (servicelist), FALSE);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (servicelist), TRUE);
- gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (servicelist), TRUE);
scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwindow2);
@@ -169,7 +168,6 @@
gtk_container_add (GTK_CONTAINER (scrolledwindow2), runlevellist);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (runlevellist), FALSE);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (runlevellist), TRUE);
- gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (runlevellist), TRUE);
AllServicesLabel = gtk_label_new (_("All existing services"));
gtk_widget_show (AllServicesLabel);
@@ -258,47 +256,3 @@
return initconf_about;
}
-GtkWidget*
-create_initconf_notimplemented (void)
-{
- GtkWidget *initconf_notimplemented;
- GtkWidget *dialog_vbox1;
- GtkWidget *NotImplementedLabel;
- GtkWidget *dialog_action_area1;
- GtkWidget *okbutton1;
-
- initconf_notimplemented = gtk_dialog_new ();
- gtk_window_set_title (GTK_WINDOW (initconf_notimplemented), _("Initconf message"));
- gtk_window_set_type_hint (GTK_WINDOW (initconf_notimplemented), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- dialog_vbox1 = GTK_DIALOG (initconf_notimplemented)->vbox;
- gtk_widget_show (dialog_vbox1);
-
- NotImplementedLabel = gtk_label_new (_("This feature is not yet implemented!"));
- gtk_widget_show (NotImplementedLabel);
- gtk_box_pack_start (GTK_BOX (dialog_vbox1), NotImplementedLabel, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (NotImplementedLabel), GTK_JUSTIFY_CENTER);
-
- dialog_action_area1 = GTK_DIALOG (initconf_notimplemented)->action_area;
- gtk_widget_show (dialog_action_area1);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
- okbutton1 = gtk_button_new_from_stock ("gtk-ok");
- gtk_widget_show (okbutton1);
- gtk_dialog_add_action_widget (GTK_DIALOG (initconf_notimplemented), okbutton1, GTK_RESPONSE_OK);
- GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) okbutton1, "clicked",
- G_CALLBACK (on_okbutton1_clicked),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (initconf_notimplemented, initconf_notimplemented, "initconf_notimplemented");
- GLADE_HOOKUP_OBJECT_NO_REF (initconf_notimplemented, dialog_vbox1, "dialog_vbox1");
- GLADE_HOOKUP_OBJECT (initconf_notimplemented, NotImplementedLabel, "NotImplementedLabel");
- GLADE_HOOKUP_OBJECT_NO_REF (initconf_notimplemented, dialog_action_area1, "dialog_action_area1");
- GLADE_HOOKUP_OBJECT (initconf_notimplemented, okbutton1, "okbutton1");
-
- return initconf_notimplemented;
-}
-
Modified: under_construction/initconf/src/interface.h
==============================================================================
--- under_construction/initconf/src/interface.h (original)
+++ under_construction/initconf/src/interface.h Thu Jan 5 15:28:22 2006
@@ -4,4 +4,3 @@
GtkWidget* create_initconf_app (void);
GtkWidget* create_initconf_about (void);
-GtkWidget* create_initconf_notimplemented (void);
Modified: under_construction/initconf/src/rlparser.c
==============================================================================
--- under_construction/initconf/src/rlparser.c (original)
+++ under_construction/initconf/src/rlparser.c Thu Jan 5 15:28:22 2006
@@ -12,21 +12,44 @@
#define BASEDIR "/etc/initng"
-int rlfilefilter(const struct dirent* entry) {
- if(!fnmatch("*.runlevel", entry->d_name, 0))
- return 1;
- else
- return 0;
+void add_to_rl(GtkWidget * any_widget) {
+ GtkWidget *runlevellist, *servicelist;
+ GtkTreeIter rliter, serviceiter;
+ GtkTreeSelection *selected;
+ GtkTreeModel *servicemodel;
+ gchar *servicename;
+ GtkListStore *rlstore;
+
+ runlevellist = lookup_widget(GTK_WIDGET(any_widget), "runlevellist");
+ servicelist = lookup_widget(GTK_WIDGET(any_widget), "servicelist");
+ selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(servicelist));
+ rlstore = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(runlevellist)));
+ if(gtk_tree_selection_get_selected(selected, &servicemodel, &serviceiter)) {
+ gtk_tree_model_get (servicemodel, &serviceiter, 0, &servicename, -1);
+ gtk_list_store_prepend (rlstore, &rliter);
+ gtk_list_store_set (rlstore, &rliter, 0, servicename, -1);
+ g_free(servicename);
+ }
}
void remove_from_rl(GtkWidget * any_widget) {
- //Ok, so I don't know how to do this. Will continue later...
- /*GtkWidget *runlevellist;
+ GtkWidget *runlevellist;
GtkTreeIter iter;
- GtkTreePath path;
+ GtkTreeSelection *selected;
+ GtkTreeModel *model;
- runlevellist = lookup_widget(GTK_WIDGET(RunlevelCombo), "runlevellist");
- path = gtk_tree_path_new_from_string(ASTGAFG);*/
+ runlevellist = lookup_widget(GTK_WIDGET(any_widget), "runlevellist");
+ selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(runlevellist));
+ if(gtk_tree_selection_get_selected(selected, &model, &iter))
+ gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+}
+
+
+int rlfilefilter(const struct dirent* entry) {
+ if(!fnmatch("*.runlevel", entry->d_name, 0))
+ return 1;
+ else
+ return 0;
}
void update_rllist(GtkWidget *RunlevelCombo) {
@@ -52,7 +75,7 @@
/* Allocate a file buffer */
char* buffer = malloc(64); //UGLY!
- GtkListStore *rlstore = gtk_tree_view_get_model(GTK_TREE_VIEW(runlevellist));
+ GtkListStore *rlstore = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(runlevellist)));
gtk_list_store_clear(rlstore);
/* Read whole file */
while(fgets(buffer, 64, file) > 0) {
Modified: under_construction/initconf/src/rlparser.h
==============================================================================
--- under_construction/initconf/src/rlparser.h (original)
+++ under_construction/initconf/src/rlparser.h Thu Jan 5 15:28:22 2006
@@ -1,3 +1,4 @@
void populate_runlevelcombo(GtkWidget * any_widget);
void init_rllist(GtkWidget * any_widget);
-remove_from_rl(GtkWidget * any_widget);
+void remove_from_rl(GtkWidget * any_widget);
+void add_to_rl(GtkWidget * any_widget);
More information about the Initng-svn
mailing list