office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-11-05 18:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Config dialog: Make screen combo box update in realtime

Browse source 
Makes PreferredScreenSelector repopulate itself when screens are added or removed;
using QApplication::screenAdded/Removed() signals.
This commit is contained in:
David Hurka 2021-03-20 18:34:12 +00:00
parent 7ffd08aafb
commit d71929ffda
2 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
part/dlgpresentation.cpp
View file

@ -151,8 +151,25 @@ PreferredScreenSelector::PreferredScreenSelector(QWidget *parent)
: QComboBox(parent)
, m_disconnectedScreenNumber(k_noDisconnectedScreenNumber)
{
repopulateList();
connect(qApp, &QGuiApplication::screenAdded, this, &PreferredScreenSelector::repopulateList);
connect(qApp, &QGuiApplication::screenRemoved, this, &PreferredScreenSelector::repopulateList);
// KConfigWidgets setup:
setProperty("kcfg_property", QByteArray("preferredScreen"));
connect(this, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) { emit preferredScreenChanged(index - k_specialScreenCount); });
}
void PreferredScreenSelector::repopulateList()
{
// Remember which index was selected before:
const int screenBeforeRepopulation = preferredScreen();
QSignalBlocker signalBlocker(this);
clear();
// Populate list:
static_assert(k_specialScreenCount == 2, "Special screens unknown to PreferredScreenSelector constructor.");
static_assert(k_specialScreenCount == 2, "Special screens unknown to PreferredScreenSelector::repopulateList().");
addItem(i18nc("@item:inlistbox Config dialog, presentation page, preferred screen", "Current Screen"));
addItem(i18nc("@item:inlistbox Config dialog, presentation page, preferred screen", "Default Screen"));
@ -170,21 +187,24 @@ PreferredScreenSelector::PreferredScreenSelector(QWidget *parent)
// If a disconnected screen is configured, it will be appended last:
m_disconnectedScreenIndex = count();
// KConfigWidgets setup:
setProperty("kcfg_property", QByteArray("preferredScreen"));
connect(this, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) { emit preferredScreenChanged(index - k_specialScreenCount); });
// If a screen of currently disconnected index was selected, keep its list item:
if (m_disconnectedScreenNumber >= m_disconnectedScreenIndex - k_specialScreenCount) {
addItem(i18nc("@item:inlistbox Config dialog, presentation page, preferred screen. %1 is the screen number (0, 1, ...), hopefully not 0.", "Screen %1 (disconnected)", m_disconnectedScreenNumber));
}
// Select the index that was selected before:
setPreferredScreen(screenBeforeRepopulation);
}
void PreferredScreenSelector::setPreferredScreen(int newScreen)
{
// Check whether the new screen is not in the list of connected screens:
if (newScreen >= m_disconnectedScreenIndex - k_specialScreenCount) {
if (m_disconnectedScreenNumber == k_noDisconnectedScreenNumber) {
addItem(QString());
if (m_disconnectedScreenNumber != newScreen) {
m_disconnectedScreenNumber = newScreen;
repopulateList();
}
setItemText(m_disconnectedScreenIndex, i18nc("@item:inlistbox Config dialog, presentation page, preferred screen. %1 is the screen number (0, 1, ...), hopefully not 0.", "Screen %1 (disconnected)", newScreen));
setCurrentIndex(m_disconnectedScreenIndex);
m_disconnectedScreenNumber = newScreen;
return;
}

8
part/dlgpresentation.h
View file

@ -59,6 +59,14 @@ protected:
* Until @c m_disconnectedScreenIndex entry is created, this is @c k_noDisconnectedScreenNumber.
*/
int m_disconnectedScreenNumber;
protected Q_SLOTS:
/**
* Populates the combobox list with items for the special screens,
* and for every connected screen.
* If @c m_disconnectedScreenNumber is set, adds an item for this disconnected screen.
*/
void repopulateList();
};
/** “Current” and “Default” */