Mac OS X improvements - Ostinato is now correctly capitalized in the MenuBar; default Wireshark path added for Mac OS X
This commit is contained in:
parent
9b1dbfb1e6
commit
c59306d78d
@ -4,8 +4,7 @@ syntax: glob
|
||||
*.o
|
||||
*.a
|
||||
*.exe
|
||||
drone.app
|
||||
ostinato.app
|
||||
*.app
|
||||
|
||||
# Qt generated files
|
||||
ui_*.h
|
||||
|
@ -44,7 +44,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
// applicationDirPath() does not return bundle, but executable inside bundle
|
||||
serverApp.replace("ostinato.app", "drone.app");
|
||||
serverApp.replace("Ostinato.app", "drone.app");
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
|
@ -1,5 +1,6 @@
|
||||
TEMPLATE = app
|
||||
CONFIG += qt
|
||||
macx: TARGET = Ostinato
|
||||
win32:RC_FILE = ostinato.rc
|
||||
macx:ICON = icons/logo.icns
|
||||
QT += network script
|
||||
|
@ -26,9 +26,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
extern QSettings *appSettings;
|
||||
|
||||
const QString kWiresharkPathKey("WiresharkPath");
|
||||
#ifdef Q_OS_WIN32
|
||||
#if defined(Q_OS_WIN32)
|
||||
const QString kWiresharkPathDefaultValue(
|
||||
"C:/Program Files/Wireshark/wireshark.exe");
|
||||
#elif defined(Q_OS_MAC)
|
||||
const QString kWiresharkPathDefaultValue(
|
||||
"/Applications/Wireshark.app/Contents/Resources/bin/wireshark");
|
||||
#else
|
||||
const QString kWiresharkPathDefaultValue("/usr/bin/wireshark");
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user