DISTRHO
/
PawPaw
mirror of
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
351 Commits
2 Branches
4.4MB
Tree: 4e581f19e0
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '4e581f19e0'
${ noResults }
PawPaw/patches/qjackctl/04_apple-win32-ui-adjustmen...

125 lines
4.7KB
Raw Blame History 

  1. diff --git a/src/qjackctlAboutForm.cpp b/src/qjackctlAboutForm.cpp

  2. index 6a28439..521b7c9 100644

  3. --- a/src/qjackctlAboutForm.cpp

  4. +++ b/src/qjackctlAboutForm.cpp

  5. @@ -68,12 +68,12 @@ qjackctlAboutForm::qjackctlAboutForm ( QWidget *pParent )

  6.  	list << tr("JACK Session support disabled.");

  7.  #endif

  8.  #ifndef CONFIG_ALSA_SEQ

  9. -#if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32)

  10. +#if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32) && !defined(__APPLE__)

  11.  	list << tr("ALSA/MIDI sequencer support disabled.");

  12.  #endif

  13.  #endif

  14.  #ifndef CONFIG_DBUS

  15. -#if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32)

  16. +#if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32) && !defined(__APPLE__)

  17.  	list << tr("D-Bus interface support disabled.");

  18.  #endif

  19.  #endif

  20. diff --git a/src/qjackctlMainForm.cpp b/src/qjackctlMainForm.cpp

  21. index ee9afa4..f206270 100644

  22. --- a/src/qjackctlMainForm.cpp

  23. +++ b/src/qjackctlMainForm.cpp

  24. @@ -584,6 +584,26 @@ qjackctlMainForm::qjackctlMainForm (

  25.  	QObject::connect(m_ui.ForwardToolButton,

  26.  		SIGNAL(clicked()),

  27.  		SLOT(transportForward()));

  28. +

  29. +#ifdef __APPLE__

  30. +	// Setup macOS menu bar

  31. +	QMenuBar* const menuBar = new QMenuBar(nullptr);

  32. +	menuBar->setNativeMenuBar(true);

  33. +

  34. +	QMenu* const menu = menuBar->addMenu("QjackCtl");

  35. +

  36. +	QAction* const actQuit = menu->addAction(tr("&Quit"));

  37. +	actQuit->setMenuRole(QAction::QuitRole);

  38. +	QObject::connect(actQuit, SIGNAL(triggered()), SLOT(quitMainForm()));

  39. +

  40. +	QAction* const actPreferences = menu->addAction(tr("Set&up..."));

  41. +	actPreferences->setMenuRole(QAction::PreferencesRole);

  42. +	QObject::connect(actPreferences, SIGNAL(triggered()), SLOT(showSetupForm()));

  43. +

  44. +	QAction* const actAbout = menu->addAction(tr("Ab&out..."));

  45. +	actAbout->setMenuRole(QAction::AboutRole);

  46. +	QObject::connect(actAbout, SIGNAL(triggered()), SLOT(showAboutForm()));

  47. +#endif

  48.  }

  49.  

  50.  

  51. @@ -906,6 +926,11 @@ bool qjackctlMainForm::setup ( qjackctlSetup *pSetup )

  52.  	// Register the first timer slot.

  53.  	QTimer::singleShot(QJACKCTL_TIMER_MSECS, this, SLOT(timerSlot()));

  54.  

  55. +#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__APPLE__)

  56. +	// increazing height make UI look ugly and it is not really useful

  57. +	setFixedHeight(height());

  58. +#endif

  59. +

  60.  	// We're ready to go...

  61.  	return true;

  62.  }

  63. diff --git a/src/qjackctlSetup.cpp b/src/qjackctlSetup.cpp

  64. index 8294606..487b7de 100644

  65. --- a/src/qjackctlSetup.cpp

  66. +++ b/src/qjackctlSetup.cpp

  67. @@ -88,6 +88,12 @@ void qjackctlSetup::loadSetup (void)

  68.  	}

  69.  	m_settings.endGroup();

  70.  

  71. +#ifdef __APPLE__

  72. +	// alternative custom defaults, as the mac theme does not look good with our custom widgets

  73. +	sCustomColorTheme = "KXStudio";

  74. +	sCustomStyleTheme = "Fusion";

  75. +#endif

  76. +

  77.  	m_settings.beginGroup("/Options");

  78.  	bSingleton               = m_settings.value("/Singleton", true).toBool();

  79.  //	sServerName              = m_settings.value("/ServerName").toString();

  80. @@ -118,8 +124,8 @@ void qjackctlSetup::loadSetup (void)

  81.  	sDisplayFont2            = m_settings.value("/DisplayFont2").toString();

  82.  	bDisplayEffect           = m_settings.value("/DisplayEffect", true).toBool();

  83.  	bDisplayBlink            = m_settings.value("/DisplayBlink", true).toBool();

  84. -	sCustomColorTheme        = m_settings.value("/CustomColorTheme").toString();

  85. -	sCustomStyleTheme        = m_settings.value("/CustomStyleTheme").toString();

  86. +	sCustomColorTheme        = m_settings.value("/CustomColorTheme", sCustomColorTheme).toString();

  87. +	sCustomStyleTheme        = m_settings.value("/CustomStyleTheme", sCustomStyleTheme).toString();

  88.  	iJackClientPortAlias     = m_settings.value("/JackClientPortAlias", 0).toInt();

  89.  	bJackClientPortMetadata  = m_settings.value("/JackClientPortMetadata", false).toBool();

  90.  	iConnectionsIconSize     = m_settings.value("/ConnectionsIconSize", QJACKCTL_ICON_16X16).toInt();

  91. diff --git a/src/qjackctlSetupForm.cpp b/src/qjackctlSetupForm.cpp

  92. index ee64fa3..703ab52 100644

  93. --- a/src/qjackctlSetupForm.cpp

  94. +++ b/src/qjackctlSetupForm.cpp

  95. @@ -126,6 +126,29 @@ qjackctlSetupForm::qjackctlSetupForm ( QWidget *pParent )

  96.  	m_iDirtySettings = 0;

  97.  	m_iDirtyOptions = 0;

  98.  

  99. +#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__APPLE__)

  100. +	// Remove useless drivers for some systems

  101. +	for (int i = m_ui.DriverComboBox->count(); --i >= 0;)

  102. +	{

  103. +		const QString itemText = m_ui.DriverComboBox->itemText(i);

  104. +		if (itemText == "dummy")

  105. +			continue;

  106. +#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)

  107. +		if (itemText == "portaudio")

  108. +			continue;

  109. +#endif

  110. +#ifdef __APPLE__

  111. +		if (itemText == "coreaudio")

  112. +			continue;

  113. +#endif

  114. +		if (itemText == "net")

  115. +			continue;

  116. +		if (itemText == "netone")

  117. +			continue;

  118. +		m_ui.DriverComboBox->removeItem(i);

  119. +	}

  120. +#endif

  121. +

  122.  	// Save original hard-coded driver names, only really

  123.  	// useful when (changing (dis)enabling JACK D-BUS...

  124.  	m_drivers.clear();