ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/util.h
(Generate patch)

Comparing Vago/trunk/Vago/util.h (file contents):
Revision 998 by s10k, Fri Apr 25 21:05:54 2014 UTC vs.
Revision 1035 by s10k, Thu Mar 24 22:28:41 2016 UTC

# Line 12 | Line 12
12   #include <QDesktopWidget>
13  
14   namespace GlobalVars{
15 < const QString AppVersion="0.9a";
15 >
16 > const QString AppVersion="0.9b";
17   const QString OniSplitString="OniSplit.exe";
18   const QString XmlToolsString="xmlTools.exe";
19  
20   #ifdef Q_OS_WIN
21   const QString OniExe="Oni.exe";
21 – const QString OniSplitExeName=OniSplitString;
22 – const QString XmlToolsExeName=XmlToolsString;
22   #else
23   const QString OniExe="Oni.app/Contents/MacOS/Oni";
25 – const QString OniSplitExeName="mono "+OniSplitString; // Mac uses mono to run .net applications
26 – const QString XmlToolsExeName="mono "+XmlToolsString;
24   #endif
25  
26   const QString AppLogName="logVago.txt";
# Line 54 | Line 51 | QString insertQuotes(QString path);
51   QString normalizeAndQuote(QString path);
52   QString fullTrim(QString str);
53   QString normalizeDecimalSeparator(QString value);
54 + QString getOSIndependentAppPath();
55 + QString getAppPath();
56 + QString getOniSplitExeName();
57 + QString getXmlToolsExeName();
58 + #ifdef Q_OS_MAC
59 + QString getMonoExecutablePath();
60 + #endif
61  
62   QStringList multipleDirDialog(QString title);
63   QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive);
# Line 64 | Line 68 | bool checkIfIntegers(QStringList toCheck
68   bool checkIfDoubles(QStringList toCheck);
69   bool isStringInteger(QString myString);
70   bool isStringDouble(QString myString);
71 < bool cpDir(const QString &srcPath, const QString &dstPath);
71 > bool copyDir(QString from_dir, QString to_dir, bool replace_on_conflit);
72   bool rmDir(const QString &dirPath);
69 – bool removeDir(const QString &dirName);
73   QRect getScreenResolution();
74   void showPopUp(QString message);
75   void showRichPopUp(QString message);
# Line 76 | Line 79 | void showErrorLogPopUp(QString message);
79   void showRichErrorPopUp(QString message);
80   void openLogFile();
81   }
79 –
82   #endif // UTIL_H

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)