Selaa lähdekoodia

gitignore; linux specific

master
Robin Thoni 10 vuotta sitten
vanhempi
commit
e9301f3ee8

+ 1
- 1
.gitignore Näytä tiedosto

@@ -9,6 +9,6 @@ ui_*
9 9
 *.so*
10 10
 *.autosave
11 11
 netsoul/netsoul
12
-ns_finder/ns_finder
12
+ns_finder/loginfinder
13 13
 usermgr/usermgr
14 14
 intrabocal/intrabocal

+ 6
- 1
Epimafia/epimafia.cpp Näytä tiedosto

@@ -1,9 +1,14 @@
1 1
 #include "epimafia.h"
2
+#include <QDir>
2 3
 
3 4
 #ifdef Q_OS_WIN
4 5
 QSettings Epimafia::m_settings("epimafia.ini", QSettings::IniFormat);
5 6
 #else
6
-#error "OS specific"
7
+	#ifdef Q_OS_LINUX
8
+	QSettings Epimafia::m_settings(QDir::homePath() + "/.epimafia.ini", QSettings::IniFormat);
9
+	#else
10
+	#error "OS specific"
11
+	#endif
7 12
 #endif
8 13
 
9 14
 unsigned char Epimafia::m_aesKey[] =

+ 6
- 2
intrabocal/widget.cpp Näytä tiedosto

@@ -103,9 +103,13 @@ void Widget::startUsrMgr()
103 103
     connect(p, SIGNAL(finished(int)), this, SLOT(processFinished(int)));
104 104
 	QString exe;
105 105
 #ifdef Q_OS_WIN
106
-	exe = "usermgr.exe";
106
+exe = "usermgr.exe";
107 107
 #else
108
-#error "OS specific"
108
+	#ifdef Q_OS_LINUX
109
+	exe = "usermgr";
110
+	#else
111
+	#error "OS specific"
112
+	#endif
109 113
 #endif
110 114
 	p->start(exe);
111 115
 }

+ 5
- 1
netsoul/connectwidget.cpp Näytä tiedosto

@@ -70,7 +70,11 @@ void ConnectWidget::launchUsrManager()
70 70
 #ifdef Q_OS_WIN
71 71
 	exe = "usermgr.exe";
72 72
 #else
73
-#error "OS specific"
73
+	#ifdef Q_OS_LINUX
74
+	exe = "usermgr";
75
+	#else
76
+	#error "OS specific"
77
+	#endif
74 78
 #endif
75 79
 	p->start(exe);
76 80
 }

+ 6
- 2
netsoul/contactswidget.cpp Näytä tiedosto

@@ -83,9 +83,13 @@ void ContactsWidget::searchOnIntra()
83 83
 {
84 84
 	QString exe;
85 85
 #ifdef Q_OS_WIN
86
-	exe = "intrabocal.exe";
86
+exe = "intrabocal.exe";
87 87
 #else
88
-#error "OS specific"
88
+	#ifdef Q_OS_LINUX
89
+	exe = "intrabocal";
90
+	#else
91
+	#error "OS specific"
92
+	#endif
89 93
 #endif
90 94
     foreach(NetSoul::User usr, ui->listContacts->getSelectedUsers())
91 95
 		QProcess::startDetached(exe, QStringList() << "-login" << usr.login);

+ 15
- 3
netsoul/options.cpp Näytä tiedosto

@@ -1,4 +1,5 @@
1 1
 #include "options.h"
2
+#include <QDir>
2 3
 
3 4
 Options* Options::m_options = 0;
4 5
 
@@ -18,7 +19,11 @@ bool Options::startAtBoot()
18 19
 	QSettings set("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat);
19 20
 	return set.childKeys().contains("Epimafia Netsoul");
20 21
 #else
21
-#error "OS sepcific"
22
+	#ifdef Q_OS_LINUX
23
+	return false;
24
+	#else
25
+	#error "OS sepcific"
26
+	#endif
22 27
 #endif
23 28
 }
24 29
 
@@ -59,7 +64,10 @@ void Options::setStartAtBoot(bool s)
59 64
 	else
60 65
 		set.remove("Epimafia Netsoul");
61 66
 #else
62
-#error "OS specific"
67
+	#ifdef Q_OS_LINUX
68
+	#else
69
+	#error "OS specific"
70
+	#endif
63 71
 #endif
64 72
 }
65 73
 
@@ -87,7 +95,11 @@ Options::Options(QObject *parent) : QObject(parent),
87 95
 	#ifdef Q_OS_WIN
88 96
 	m_settings("epimafianetsoul.ini", QSettings::IniFormat)
89 97
 	#else
90
-	#error "OS specific"
98
+		#ifdef Q_OS_LINUX
99
+		m_settings(QDir::homePath() + "/.epimafianetsoul.ini", QSettings::IniFormat)
100
+		#else
101
+		#error "OS specific"
102
+		#endif
91 103
 	#endif
92 104
 {
93 105
 }

+ 5
- 1
ns_finder/widget.cpp Näytä tiedosto

@@ -124,7 +124,11 @@ void Widget::on_btnSearchLogin_clicked()
124 124
 #ifdef Q_OS_WIN
125 125
 	exe = "intrabocal.exe";
126 126
 #else
127
-#error "OS specific"
127
+	#ifdef Q_OS_LINUX
128
+	exe = "intrabocal";
129
+	#else
130
+	#error "OS specific"
131
+	#endif
128 132
 #endif
129 133
 	QProcess::startDetached(exe, QStringList() << "-logins" << logins);
130 134
 }

Loading…
Peruuta
Tallenna