Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting commit from r677

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@679 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000
2015-02-01 12:31:15 +00:00
committed by mrovi9000@gmail.com
parent b70e6b500e
commit 856385d5c0
6 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/tint2conf/properties.c
View File

@@ -985,7 +985,6 @@ void create_panel(GtkWidget *parent)
gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Top"));
gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Normal"));
gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Bottom"));
gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Float"));
label = gtk_label_new(_("Maximized window"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);

12
src/tint2conf/properties_rw.c
View File

@@ -138,12 +138,10 @@ void config_write_panel(FILE *fp)
fprintf(fp, "\n");
fprintf(fp, "panel_layer = ");
if (gtk_combo_box_get_active(GTK_COMBO_BOX(panel_combo_layer)) == 2) {
if (gtk_combo_box_get_active(GTK_COMBO_BOX(panel_combo_layer)) == 0) {
fprintf(fp, "top");
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(panel_combo_layer)) == 1) {
fprintf(fp, "normal");
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(panel_combo_layer)) == 3) {
fprintf(fp, "float");
fprintf(fp, "center");
} else {
fprintf(fp, "bottom");
}
@@ -689,11 +687,9 @@ void add_entry(char *key, char *value)
}
else if (strcmp(key, "panel_layer") == 0) {
if (strcmp(value, "bottom") == 0)
gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 0);
else if (strcmp(value, "top") == 0)
gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 2);
else if (strcmp(value, "float") == 0)
gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 3);
else if (strcmp(value, "top") == 0)
gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 0);
else
gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 1);
}

2
src/tint2conf/tintwizard.py
View File

@@ -502,7 +502,7 @@ class TintWizardGUI(gtk.Window):
self.registerComponent("panel_dock", self.panelDock)
createLabel(self.tablePanelSettings, text="Panel Layer", gridX=0, gridY=2, xPadding=10)
self.panelLayer = createComboBox(self.tablePanelSettings, ["bottom", "top", "normal", "float"], gridX=1, gridY=2, handler=self.changeOccurred)
self.panelLayer = createComboBox(self.tablePanelSettings, ["bottom", "top", "normal"], gridX=1, gridY=2, handler=self.changeOccurred)
self.registerComponent("panel_layer", self.panelLayer)
createLabel(self.tablePanelSettings, text="Strut Policy", gridX=0, gridY=3, xPadding=10)