*** tintwizard.py 2009-08-30 11:43:54.000000000 +0200 --- tintwizard-patch.py 2010-01-05 17:46:08.569386019 +0100 *************** *** 334,340 **** self.tableBgs.attach(temp, 1, 2, 1, 2, xoptions=gtk.EXPAND, yoptions=gtk.EXPAND) # Panel Options ! self.tablePanel = gtk.Table(rows=9, columns=3, homogeneous=False) self.tablePanel.set_row_spacings(5) self.tablePanel.set_col_spacings(5) --- 334,340 ---- self.tableBgs.attach(temp, 1, 2, 1, 2, xoptions=gtk.EXPAND, yoptions=gtk.EXPAND) # Panel Options ! self.tablePanel = gtk.Table(rows=10, columns=3, homogeneous=False) self.tablePanel.set_row_spacings(5) self.tablePanel.set_col_spacings(5) *************** *** 365,440 **** self.panelOrientation.set_active(0) self.panelOrientation.connect("changed", self.changeOccurred) self.tablePanel.attach(self.panelOrientation, 1, 2, 1, 2, xoptions=gtk.EXPAND, yoptions=gtk.EXPAND) self.panelSizeLabel = gtk.Label("Size (width, height)") self.panelSizeLabel.set_alignment(0, 0.5) ! self.tablePanel.attach(self.panelSizeLabel, 0, 1, 2, 3, xpadding=10) self.panelSizeX = gtk.Entry(6) self.panelSizeX.set_width_chars(8) self.panelSizeX.set_text(PANEL_SIZE_X) self.panelSizeX.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelSizeX, 1, 2, 2, 3, xoptions=gtk.EXPAND) self.panelSizeY = gtk.Entry(6) self.panelSizeY.set_width_chars(8) self.panelSizeY.set_text(PANEL_SIZE_Y) self.panelSizeY.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelSizeY, 2, 3, 2, 3, xoptions=gtk.EXPAND) temp = gtk.Label("Margin (x, y)") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 3, 4, xpadding=10) self.panelMarginX = gtk.Entry(6) self.panelMarginX.set_width_chars(8) self.panelMarginX.set_text(PANEL_MARGIN_X) self.panelMarginX.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelMarginX, 1, 2, 3, 4, xoptions=gtk.EXPAND) self.panelMarginY = gtk.Entry(6) self.panelMarginY.set_width_chars(8) self.panelMarginY.set_text(PANEL_MARGIN_Y) self.panelMarginY.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelMarginY, 2, 3, 3, 4, xoptions=gtk.EXPAND) temp = gtk.Label("Padding (x, y)") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 4, 5, xpadding=10) self.panelPadX = gtk.Entry(6) self.panelPadX.set_width_chars(8) self.panelPadX.set_text(PANEL_PADDING_Y) self.panelPadX.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelPadX, 1, 2, 4, 5, xoptions=gtk.EXPAND) self.panelPadY = gtk.Entry(6) self.panelPadY.set_width_chars(8) self.panelPadY.set_text(PANEL_PADDING_Y) self.panelPadY.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelPadY, 2, 3, 4, 5, xoptions=gtk.EXPAND) temp = gtk.Label("Panel Background ID") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 5, 6, xpadding=10) self.panelBg = gtk.combo_box_new_text() self.panelBg.append_text("0 (fully transparent)") for i in range(len(self.bgs)): self.panelBg.append_text(str(i+1)) self.panelBg.set_active(0) self.panelBg.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelBg, 1, 2, 5, 6, xoptions=gtk.EXPAND, yoptions=gtk.EXPAND) temp = gtk.Label("Window Manager Menu") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 6, 7, xpadding=10) self.panelMenu = gtk.CheckButton() self.panelMenu.set_active(False) self.panelMenu.connect("toggled", self.changeOccurred) ! self.tablePanel.attach(self.panelMenu, 1, 2, 6, 7, xoptions=gtk.EXPAND) temp = gtk.Label("Panel Monitor (all, 1, 2...)") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 7, 8, xpadding=10) self.panelMonitor = gtk.Entry(6) self.panelMonitor.set_width_chars(8) self.panelMonitor.set_text(PANEL_MONITOR) self.panelMonitor.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelMonitor, 1, 2, 7, 8, xoptions=gtk.EXPAND) # Taskbar self.tableTaskbar = gtk.Table(rows=4, columns=3, homogeneous=False) --- 365,448 ---- self.panelOrientation.set_active(0) self.panelOrientation.connect("changed", self.changeOccurred) self.tablePanel.attach(self.panelOrientation, 1, 2, 1, 2, xoptions=gtk.EXPAND, yoptions=gtk.EXPAND) + + temp = gtk.Label("Maximize over panel") + temp.set_alignment(0, 0.5) + self.tablePanel.attach(temp, 0, 1, 2, 3, xpadding=10) + self.panelMaxOver = gtk.CheckButton() + self.panelMaxOver.set_active(False) + self.panelMaxOver.connect("toggled", self.changeOccurred) + self.tablePanel.attach(self.panelMaxOver, 1, 2, 2, 3, xoptions=gtk.EXPAND) self.panelSizeLabel = gtk.Label("Size (width, height)") self.panelSizeLabel.set_alignment(0, 0.5) ! self.tablePanel.attach(self.panelSizeLabel, 0, 1, 3, 4, xpadding=10) self.panelSizeX = gtk.Entry(6) self.panelSizeX.set_width_chars(8) self.panelSizeX.set_text(PANEL_SIZE_X) self.panelSizeX.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelSizeX, 1, 2, 3, 4, xoptions=gtk.EXPAND) self.panelSizeY = gtk.Entry(6) self.panelSizeY.set_width_chars(8) self.panelSizeY.set_text(PANEL_SIZE_Y) self.panelSizeY.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelSizeY, 2, 3, 3, 4, xoptions=gtk.EXPAND) temp = gtk.Label("Margin (x, y)") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 4, 5, xpadding=10) self.panelMarginX = gtk.Entry(6) self.panelMarginX.set_width_chars(8) self.panelMarginX.set_text(PANEL_MARGIN_X) self.panelMarginX.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelMarginX, 1, 2, 4, 5, xoptions=gtk.EXPAND) self.panelMarginY = gtk.Entry(6) self.panelMarginY.set_width_chars(8) self.panelMarginY.set_text(PANEL_MARGIN_Y) self.panelMarginY.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelMarginY, 2, 3, 4, 5, xoptions=gtk.EXPAND) temp = gtk.Label("Padding (x, y)") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 5, 6, xpadding=10) self.panelPadX = gtk.Entry(6) self.panelPadX.set_width_chars(8) self.panelPadX.set_text(PANEL_PADDING_Y) self.panelPadX.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelPadX, 1, 2, 5, 6, xoptions=gtk.EXPAND) self.panelPadY = gtk.Entry(6) self.panelPadY.set_width_chars(8) self.panelPadY.set_text(PANEL_PADDING_Y) self.panelPadY.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelPadY, 2, 3, 5, 6, xoptions=gtk.EXPAND) temp = gtk.Label("Panel Background ID") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 6, 7, xpadding=10) self.panelBg = gtk.combo_box_new_text() self.panelBg.append_text("0 (fully transparent)") for i in range(len(self.bgs)): self.panelBg.append_text(str(i+1)) self.panelBg.set_active(0) self.panelBg.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelBg, 1, 2, 6, 7, xoptions=gtk.EXPAND, yoptions=gtk.EXPAND) temp = gtk.Label("Window Manager Menu") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 7, 8, xpadding=10) self.panelMenu = gtk.CheckButton() self.panelMenu.set_active(False) self.panelMenu.connect("toggled", self.changeOccurred) ! self.tablePanel.attach(self.panelMenu, 1, 2, 7, 8, xoptions=gtk.EXPAND) temp = gtk.Label("Panel Monitor (all, 1, 2...)") temp.set_alignment(0, 0.5) ! self.tablePanel.attach(temp, 0, 1, 8, 9, xpadding=10) self.panelMonitor = gtk.Entry(6) self.panelMonitor.set_width_chars(8) self.panelMonitor.set_text(PANEL_MONITOR) self.panelMonitor.connect("changed", self.changeOccurred) ! self.tablePanel.attach(self.panelMonitor, 1, 2, 8, 9, xoptions=gtk.EXPAND) # Taskbar self.tableTaskbar = gtk.Table(rows=4, columns=3, homogeneous=False) *************** *** 990,995 **** --- 998,1004 ---- "panel_size": (self.panelSizeX, self.panelSizeY), "panel_margin": (self.panelMarginX, self.panelMarginY), "panel_padding": (self.panelPadX, self.panelPadY), + "panel_maxover": self.panelMaxOver, "wm_menu": self.panelMenu, "panel_background_id": self.panelBg, "taskbar_mode": self.taskbarMode, *************** *** 1309,1314 **** --- 1318,1324 ---- self.panelMarginY.get_text() if self.panelMarginY.get_text() else PANEL_MARGIN_Y)) self.configBuf.insert(self.configBuf.get_end_iter(), "panel_padding = %s %s\n" % (self.panelPadX.get_text() if self.panelPadX.get_text() else PANEL_PADDING_X, self.panelPadY.get_text() if self.panelPadY.get_text() else PANEL_PADDING_Y)) + self.configBuf.insert(self.configBuf.get_end_iter(), "panel_maxover = %s\n" % int(self.panelMaxOver.get_active())) self.configBuf.insert(self.configBuf.get_end_iter(), "wm_menu = %s\n" % int(self.panelMenu.get_active())) self.configBuf.insert(self.configBuf.get_end_iter(), "panel_background_id = %s\n" % (self.panelBg.get_active())) *************** *** 1482,1487 **** --- 1492,1498 ---- self.panelMarginY.set_text(PANEL_MARGIN_Y) self.panelPadX.set_text(PANEL_PADDING_Y) self.panelPadY.set_text(PANEL_PADDING_Y) + self.panelMaxOver.set_active(0) self.panelBg.set_active(0) self.panelMenu.set_active(0) self.panelMonitor.set_text(PANEL_MONITOR)