summaryrefslogtreecommitdiffstats
path: root/src/curses-ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/curses-ui')
-rw-r--r--src/curses-ui/.gitignore1
-rw-r--r--src/curses-ui/curses-ui.vala4
-rw-r--r--src/curses-ui/logo.vala4
-rw-r--r--src/curses-ui/main.vala7
4 files changed, 6 insertions, 10 deletions
diff --git a/src/curses-ui/.gitignore b/src/curses-ui/.gitignore
deleted file mode 100644
index b66c764..0000000
--- a/src/curses-ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-curses-ui
diff --git a/src/curses-ui/curses-ui.vala b/src/curses-ui/curses-ui.vala
index e98c6ea..539c959 100644
--- a/src/curses-ui/curses-ui.vala
+++ b/src/curses-ui/curses-ui.vala
@@ -23,7 +23,7 @@ public class CursesUI {
//StatusPanel statuswin;
MessageBoxOverlay mbOverlay;
- public CursesUI(string datadir) {
+ public CursesUI(string configdir) {
/* unicode support */
Intl.setlocale(LocaleCategory.CTYPE, "");
@@ -40,7 +40,7 @@ public class CursesUI {
Curses.init_pair(2, Curses.Color.WHITE, Curses.Color.RED);
/* initialize widgets */
- banner = new Logo(datadir);
+ banner = new Logo(configdir);
//statuswin = new StatusPanel();
messages = new MessageBox();
clkwin = new ClockWindow();
diff --git a/src/curses-ui/logo.vala b/src/curses-ui/logo.vala
index a4a2c2c..1bb609b 100644
--- a/src/curses-ui/logo.vala
+++ b/src/curses-ui/logo.vala
@@ -19,13 +19,13 @@ using Curses;
public class Logo {
Window win;
- public Logo(string datadir) {
+ public Logo(string configdir) {
win = new Window(8, COLS - 2, 0, 1);
win.bkgdset(COLOR_PAIR(1) | Attribute.BOLD);
win.addstr("\n");
- var logofilename = Path.build_filename(datadir, "logo.txt");
+ var logofilename = Path.build_filename(configdir, "logo.txt");
var file = File.new_for_path(logofilename);
if (!file.query_exists()) {
stderr.printf (_("File '%s' doesn't exist.\n"), file.get_path ());
diff --git a/src/curses-ui/main.vala b/src/curses-ui/main.vala
index 3518bb2..adeb67f 100644
--- a/src/curses-ui/main.vala
+++ b/src/curses-ui/main.vala
@@ -19,7 +19,6 @@ public MainLoop loop;
public AudioPlayer audio;
public ScannerSession scanner;
public CursesUI ui;
-private Config cfg;
private static void play(string file) {
try {
@@ -57,11 +56,9 @@ public static int main(string[] args) {
try {
audio = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio");
scanner = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.ScannerSession", "/io/mainframe/shopsystem/scanner_session");
- cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
- var datapath = cfg.get_string("GENERAL", "datapath");
- var datadir = Path.build_filename(datapath, "curses-ui");
- ui = new CursesUI(datadir);
+ var configdir = "/etc/shopsystem";
+ ui = new CursesUI(configdir);
} catch(IOError e) {
error(_("IO Error: %s\n"), e.message);
} catch(DBusError e) {