Merge ~daniel-kaluza-dk/dpcs:settingsPanel into dpcs:master

[Daniel Kałuża]

[Marek Bardoński (bdfhjk)]

There are no changes inside.

review: Needs Fixing (static)

[Dzjkb (jakub-pies)]

review: Abstain

a844da3... by Daniel Kałuża on 2016-03-05

Panel v 1.0

1c529f8... by Daniel Kałuża on 2016-03-06

Panel v 1.1

[Mateusz Susik (mateuszsusik)]

IOError: [Errno 13] Brak dostępu: '/etc/dpcs.conf'

Po wciśnięciu OK. Jeśli ustawienia będą wymagać sudo, to należy je zaimplementować tak, aby były wymagane przy uruchamianiu - w podobny sposób jak działają np. menadżery pakietów.

review: Needs Information

0ea1b7e... by Daniel Kałuża on 2016-03-07

Panel v1.2 with evoker.

b19324e... by Daniel Kałuża on 2016-03-07

remove settingsPanel.py

[Mateusz Susik (mateuszsusik)]

1). The settings file is uncleae - I see only ones and zeros after opening it with a text editor and I don't know whoch value corresponds to which option. If you don't want to spend time on parsing, use JSON format.

2). panelEvoker should have if __name__ == "__main__"

3). panelEvoker introduces additional requirement: superuser must have access to Python. On some computers Python is not available and it should be possible to change settings without global python installation. You should be able to implement a solution where you ask the user for a password and then use it for handling the file.

[Mateusz Susik (mateuszsusik)]

If you don't want to implement a solution for sudo, a user-wise configuration should be good as well.

Please move to our github repo, and take https://github.com/bdfhjk/DPCS/issues/5

[Daniel Kałuża (daniel-kaluza-dk)]

We will manage with sudo solution and handling the file, I hope I will push
the new solution later today

2016-03-09 20:49 GMT+01:00 Mateusz Susik <email address hidden>:

> If you don't want to implement a solution for sudo, a user-wise
> configuration should be good as well.
>
> Please move to our github repo, and take
> https://github.com/bdfhjk/DPCS/issues/5
> --
> https://code.launchpad.net/~daniel-kaluza-dk/dpcs/+git/dpcs/+merge/288181
> You are the owner of ~daniel-kaluza-dk/dpcs:settingsPanel.
>

Unmerged commits

b19324e... by Daniel Kałuża on 2016-03-07

remove settingsPanel.py

0ea1b7e... by Daniel Kałuża on 2016-03-07

Panel v1.2 with evoker.

1c529f8... by Daniel Kałuża on 2016-03-06

Panel v 1.1

a844da3... by Daniel Kałuża on 2016-03-05

Panel v 1.0

diff --git a/client/settings/panel.py b/client/settings/panel.py
new file mode 100644
index 0000000..243dbd5
--- /dev/null
+++ b/client/settings/panel.py
@@ -0,0 +1,138 @@
+#coding: utf-8
+
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+import os.path
+import subprocess
+
+# the window title
+PANELTITLE = "DPCS Settings"
+
+# about DPCS - authors, basic info, licensing and such...
+ABOUT_DPCS = """ To be written!
+"""
+
+# minimal window width and height
+WIDTH = 350
+HEIGHT = 400
+# list with the settings
+settings = []
+#config file path
+FILE = '/etc/dpcs.conf'
+
+def displaypanel():
+	""" displays the prefs dialog
+	""" 
+	win = SettingsPanel()
+	win.show_all()
+	Gtk.main()
+
+def addCheckButton(label, parent): 
+	""" add checkbox with label @label to container @parent 
+	"""
+	checkButton = Gtk.CheckButton.new_with_label(label)
+	parent.pack_start(checkButton, False, False, 10)
+	settings.append(checkButton)
+	return checkButton
+		
+def save_setting (checkButton, file_ptr): 
+	""" saves checkbox value as new line to @file_ptr
+	"""
+	if checkButton.get_active():
+		value = '1'
+	else:
+		value = '0' 		
+	value = str( value + '\n')		
+	file_ptr.write(value)
+def load_setting (checkButton, line): 
+	""" loads initial value of @checkbutton from @line in config
+	"""	
+	if line == '1\n' :
+		checkButton.set_active(True)
+	else:
+		checkButton.set_active(False)
+
+class SettingsPanel(Gtk.Window):
+	""" The preferences dialog for DPCS
+	"""
+	
+	def __init__(self):
+		Gtk.Window.__init__(self, title=PANELTITLE)
+		self.set_size_request(WIDTH,HEIGHT)
+
+		maincontainer = Gtk.Box(orientation = Gtk.Orientation.VERTICAL, spacing = 0)
+		self.add(maincontainer)
+
+		notebook = Gtk.Notebook()
+		maincontainer.pack_start(notebook, True, True, 0)
+
+		buttonscontainer = Gtk.Box(orientation = Gtk.Orientation.HORIZONTAL)
+		maincontainer.pack_start(buttonscontainer, False, False, 0)
+
+		# settings tab
+
+		settingspage = Gtk.Box(orientation = Gtk.Orientation.VERTICAL, spacing = 5)
+
+		# add setting boxes here by addCheckButton(Label, Box)
+		
+		eb = addCheckButton('Enable DPCS', settingspage)
+		ab = addCheckButton('test1', settingspage)
+		bb = addCheckButton('test2', settingspage)
+		gb = addCheckButton('test3', settingspage)
+		
+		# end of setting boxes
+
+		notebook.append_page(settingspage, Gtk.Label('Settings'))
+
+		# about DPCS tab
+
+		aboutpage = Gtk.Box(orientation = Gtk.Orientation.VERTICAL, spacing = 5)
+
+		acontent = Gtk.Label()
+		acontent.set_text(ABOUT_DPCS)
+		acontent.set_justify(Gtk.Justification.LEFT)
+		aboutpage.pack_start(acontent, True, True, 0)
+
+		notebook.append_page(aboutpage, Gtk.Label('About DPCS'))
+
+		# ok, apply and cancel buttons
+
+		self.ok = Gtk.Button(label="Ok")
+		cancel = Gtk.Button(label="Cancel")
+		applyb = Gtk.Button(label="Apply")
+
+		buttonscontainer.pack_end(self.ok, False, False, 0)
+		buttonscontainer.pack_end(applyb, False, False, 0)
+		buttonscontainer.pack_end(cancel, False, False, 0)
+
+		cancel.connect("clicked", Gtk.main_quit)
+		applyb.connect("clicked", self.applysettings)
+		self.ok.connect("clicked", self.applysettings)
+		
+		# loads current config
+		self.loadconfig()
+		self.connect("delete-event", Gtk.main_quit)
+
+	def applysettings(self, widget):
+		""" writes settings to dpcs.config, exits
+		if ok has been pressed
+		"""
+		f = open(FILE, 'w')
+		for s in settings:
+			save_setting(s, f)
+		f.close()
+		if widget == self.ok:
+			Gtk.main_quit()
+
+	def loadconfig(self):
+		""" loads current settings from dpcs.config
+		"""
+		if os.path.isfile(FILE):
+			i=0
+			f = open(FILE, 'r')
+			for line in f:
+				load_setting(settings[i],line)
+				i+=1
+			f.close()
+displaypanel()
diff --git a/client/settings/panelEvoker.py b/client/settings/panelEvoker.py
new file mode 100644
index 0000000..5c7c389
--- /dev/null
+++ b/client/settings/panelEvoker.py
@@ -0,0 +1,6 @@
+#coding: utf-8
+
+import subprocess
+
+subprocess.call(["sudo python panel.py"], shell=True )
+
diff --git a/client/settings/readme.md b/client/settings/readme.md
index 9c558e3..003cdb5 100644
--- a/client/settings/readme.md
+++ b/client/settings/readme.md
@@ -1 +1 @@
-.
+Pushed second version of settigs panel, with evoker.