matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac OS X improvements - Ostinato is now correctly capitalized in the MenuBar; default Wireshark path added for Mac OS X

Browse Source
This commit is contained in:
Srivats P. 2010-07-17 03:54:35 +05:30
parent 9b1dbfb1e6
commit c59306d78d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgignore
View File

@ -4,8 +4,7 @@ syntax: glob
*.o *.o
*.a *.a
*.exe *.exe
drone.app *.app
ostinato.app
# Qt generated files # Qt generated files
ui_*.h ui_*.h

2
client/mainwindow.cpp
View File

@ -44,7 +44,7 @@ MainWindow::MainWindow(QWidget *parent)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// applicationDirPath() does not return bundle, but executable inside bundle // applicationDirPath() does not return bundle, but executable inside bundle
serverApp.replace("ostinato.app", "drone.app"); serverApp.replace("Ostinato.app", "drone.app");
#endif #endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32

1
client/ostinato.pro
View File

@ -1,5 +1,6 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt CONFIG += qt
macx: TARGET = Ostinato
win32:RC_FILE = ostinato.rc win32:RC_FILE = ostinato.rc
macx:ICON = icons/logo.icns macx:ICON = icons/logo.icns
QT += network script QT += network script

5
client/settings.h
View File

@ -26,9 +26,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
extern QSettings *appSettings; extern QSettings *appSettings;
const QString kWiresharkPathKey("WiresharkPath"); const QString kWiresharkPathKey("WiresharkPath");
#ifdef Q_OS_WIN32 #if defined(Q_OS_WIN32)
const QString kWiresharkPathDefaultValue( const QString kWiresharkPathDefaultValue(
"C:/Program Files/Wireshark/wireshark.exe"); "C:/Program Files/Wireshark/wireshark.exe");
#elif defined(Q_OS_MAC)
const QString kWiresharkPathDefaultValue(
"/Applications/Wireshark.app/Contents/Resources/bin/wireshark");
#else #else
const QString kWiresharkPathDefaultValue("/usr/bin/wireshark"); const QString kWiresharkPathDefaultValue("/usr/bin/wireshark");
#endif #endif