Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Library: add multi-line editor delegate for comment column #11752

Merged
merged 17 commits into from
Aug 15, 2023
Merged

Library: add multi-line editor delegate for comment column #11752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8079fa7
Library: add multi-line editor delegate for comment column
ronso0 Jul 18, 2023
e03b98e
MultiLineEditDelegate: fix right-click events / context menu
ronso0 Jul 18, 2023
5020342
skins: set styles for multi-line table editor
ronso0 Jul 18, 2023
303cab9
TableItemDelegate: add default paintItem() implementation
ronso0 Jul 18, 2023
d4fd3eb
MultiLineEditDelegate: don't let editor overlap macOS scrollbars
ronso0 Jul 23, 2023
550f4df
MultiLineEditDelegate: don't let the editor shrink smaller than the o…
ronso0 Jul 23, 2023
2f55431
MultiLineEditDelegate: (fix macOS) cover underlying index text
ronso0 Jul 25, 2023
3f6dc73
MultiLineEditDelegate: always remove scrollbars for one-liners
ronso0 Jul 25, 2023
87d2dfd
MultiLineEditDelegate: allow editor to expand horizontally like QLine…
ronso0 Jul 27, 2023
857b7cb
MultiLineEditDelegate: ensure correct editor position after scroll & …
ronso0 Jul 27, 2023
f28ea7b
MultiLineEditDelegate: center one-line text vertically in editor
ronso0 Jul 28, 2023
53cee16
MultiLineEditor: iRect -> indexRect
ronso0 Aug 10, 2023
cfe15f0
MultiLineEditor: move size adjust to MultiLineEditor class
ronso0 Aug 10, 2023
9ec5ed6
MultiLineEditor: setContentsMargins() to apply v-center offset only v…
ronso0 Aug 10, 2023
ce3e4d3
MultiLineEditor: calculate correct height with QFontMetrics height()
ronso0 Aug 11, 2023
3917548
MultiLineEditor: overhaul adjustSize(), compact h/w calc, scroll fixe…
ronso0 Aug 12, 2023
0fe376b
MultiLineEditor: work around unneeded h-scrolbars with texts wider th…
ronso0 Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/locationdelegate.cpp
src/library/missingtablemodel.cpp
src/library/mixxxlibraryfeature.cpp
src/library/multilineeditdelegate.cpp
src/library/parser.cpp
src/library/parsercsv.cpp
src/library/parserm3u.cpp
Expand Down
20 changes: 13 additions & 7 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,13 @@ WLibraryTextBrowser {

/* Table cell in edit mode */
WLibrary QLineEdit,
WLibrary QPlainTextEdit,
WBeatSpinBox,
#LibraryBPMSpinBox {
selection-color: #000;
selection-background-color: #ccc;
}
WLibrary QLineEdit,
#LibraryBPMSpinBox {
color: #ddd;
background-color: #0f0f0f;
selection-color: #000;
selection-background-color: #ccc;
border: 1px solid #006596;
}

Expand Down Expand Up @@ -847,6 +845,7 @@ WTrackTableViewHeader::section,
WLibraryTextBrowser,
WLibraryTextBrowser QMenu,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCueMenuPopup QLabel,
WCueMenuPopup QLineEdit,
Expand Down Expand Up @@ -1961,6 +1960,8 @@ WTrackMenu QMenu::item,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QLineEdit QMenu::item,
QPlainTextEdit QMenu,
QPlainTextEdit QMenu::item,
WCoverArtMenu,
WCoverArtMenu::item,
WCueMenuPopup,
Expand All @@ -1983,6 +1984,7 @@ WLibraryTextBrowser QMenu,
WTrackMenu,
WTrackMenu QMenu,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCoverArtMenu,
WEffectSelector QAbstractScrollArea,
Expand Down Expand Up @@ -2012,6 +2014,7 @@ WSearchLineEdit QAbstractScrollArea,
WTrackMenu QMenu QCheckBox:focus,
WTrackMenu QMenu QCheckBox:hover,
QLineEdit QMenu::item:selected,
QPlainTextEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectSelector::indicator:unchecked:selected,
Expand Down Expand Up @@ -2196,7 +2199,8 @@ WTrackTableViewHeader QMenu::separator,
WTrackMenu::separator,
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator {
QLineEdit QMenu::separator,
QPlainTextEdit QMenu::separator {
border-top: 1px solid #999;
}

Expand All @@ -2211,6 +2215,7 @@ WTrackMenu QMenu QCheckBox::indicator {
}

QLineEdit QMenu::icon:selected,
QPlainTextEdit QMenu::icon:selected,
WLibrarySidebar QMenu::indicator:selected,
WTrackTableViewHeader QMenu::indicator:selected,
WTrackMenu QMenu QCheckBox::indicator:selected {
Expand All @@ -2223,7 +2228,8 @@ WLibrarySidebar QMenu::item:disabled,
WTrackMenu::item:disabled,
WTrackMenu QMenu::item:disabled,
WTrackMenu QMenu QCheckBox:disabled,
QLineEdit QMenu::item:disabled {
QLineEdit QMenu::item:disabled,
QPlainTextEdit QMenu::item:disabled {
color: #555;
}
WTrackMenu QMenu QCheckBox::indicator:disabled {
Expand Down
10 changes: 9 additions & 1 deletion res/skins/LateNight/style_classic.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,7 @@ WTrackMenu,
WTrackMenu QMenu,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WEffectChainPresetButton QMenu,
WEffectChainPresetButton QMenu QCheckBox,
WCoverArtMenu,
Expand Down Expand Up @@ -2101,6 +2102,7 @@ WLibrarySidebar {

/* Table cell in edit mode */
WLibrary QLineEdit,
WLibrary QPlainTextEdit,
#LibraryBPMSpinBox {
color: #ddd;
background-color: #0f0f0f;
Expand Down Expand Up @@ -2415,6 +2417,7 @@ WLibraryTextBrowser QMenu,
WTrackMenu,
WTrackMenu QMenu,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCoverArtMenu,
WEffectSelector QAbstractScrollArea,
Expand Down Expand Up @@ -2447,6 +2450,8 @@ WTrackMenu QMenu::item,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QLineEdit QMenu::item,
QPlainTextEdit QMenu,
QPlainTextEdit QMenu::item,
WCoverArtMenu,
WCoverArtMenu::item,
WCueMenuPopup,
Expand Down Expand Up @@ -2484,6 +2489,7 @@ WTrackMenu QMenu QCheckBox:selected,
WTrackMenu QMenu QCheckBox:focus,
WTrackMenu QMenu QCheckBox:hover,
QLineEdit QMenu::item:selected,
QPlainTextEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectChainPresetSelector:item:selected,
Expand Down Expand Up @@ -2525,7 +2531,8 @@ WLibrarySidebar QMenu::item:disabled,
WTrackMenu::item:disabled,
WTrackMenu QMenu::item:disabled,
WTrackMenu QMenu QCheckBox:disabled,
QLineEdit QMenu::item:disabled {
QLineEdit QMenu::item:disabled,
QPlainTextEdit QMenu::item:disabled {
color: #494949;
}

Expand Down Expand Up @@ -2601,6 +2608,7 @@ QLineEdit QMenu::item:disabled {
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator,
QPlainTextEdit QMenu::separator,
WEffectChainPresetButton QMenu::separator,
#SkinSettingsSeparator {
border-top: 1px solid #000;
Expand Down
11 changes: 10 additions & 1 deletion res/skins/LateNight/style_palemoon.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,7 @@ WTrackMenu QMenu QCheckBox,
WEffectChainPresetButton QMenu,
WEffectChainPresetButton QMenu QCheckBox,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCueMenuPopup QLabel,
#CueLabelEdit,
Expand Down Expand Up @@ -2527,6 +2528,7 @@ WLibrarySidebar,
#SkinSettings,
WSearchLineEdit,
WLibrary QLineEdit,
WLibrary QPlainTextEdit,
#spinBoxTransition,
#LibraryBPMSpinBox {
background-color: #0f0f0f;
Expand Down Expand Up @@ -2589,6 +2591,7 @@ WTrackTableView {

/* Table cell in edit mode */
WLibrary QLineEdit,
WLibrary QPlainTextEdit,
#LibraryBPMSpinBox {
color: #ddd;
selection-color: #000;
Expand Down Expand Up @@ -2909,6 +2912,7 @@ WLibraryTextBrowser QMenu,
WTrackMenu,
WTrackMenu QMenu,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCoverArtMenu,
WEffectSelector QAbstractScrollArea,
Expand Down Expand Up @@ -2939,6 +2943,8 @@ WTrackMenu QMenu::item,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QLineEdit QMenu::item,
QPlainTextEdit QMenu,
QPlainTextEdit QMenu::item,
WCoverArtMenu,
WCoverArtMenu::item,
WCueMenuPopup,
Expand Down Expand Up @@ -2972,6 +2978,7 @@ WTrackMenu QMenu QCheckBox:selected,
WTrackMenu QMenu QCheckBox:focus,
WTrackMenu QMenu QCheckBox:hover,
QLineEdit QMenu::item:selected,
QPlainTextEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectChainPresetSelector::item:selected,
Expand Down Expand Up @@ -3018,7 +3025,8 @@ WLibrarySidebar QMenu::item:disabled,
WTrackMenu::item:disabled,
WTrackMenu QMenu::item:disabled,
WTrackMenu QMenu QCheckBox:disabled,
QLineEdit QMenu::item:disabled {
QLineEdit QMenu::item:disabled,
QPlainTextEdit QMenu::item:disabled {
color: #494949;
}

Expand All @@ -3029,6 +3037,7 @@ QLineEdit QMenu::item:disabled {
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator,
QPlainTextEdit QMenu::separator,
WEffectChainPresetButton QMenu::separator,
#SkinSettingsSeparator {
border-top: 1px solid #000;
Expand Down
12 changes: 10 additions & 2 deletions res/skins/Shade/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ WLibrarySidebar QMenu,
WLibraryTextBrowser,
WLibraryTextBrowser QMenu,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCueMenuPopup QMenu,
WCueMenuPopup QLabel,
Expand Down Expand Up @@ -109,6 +110,8 @@ WTrackMenu QMenu::item,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QLineEdit QMenu::item,
QPlainTextEdit QMenu,
QPlainTextEdit QMenu::item,
WBeatSpinBox::up-button,
WBeatSpinBox::down-button,
WCueMenuPopup,
Expand Down Expand Up @@ -159,6 +162,7 @@ WTrackMenu QMenu QCheckBox:selected,
WTrackMenu QMenu QCheckBox:focus,
WTrackMenu QMenu QCheckBox:hover,
QLineEdit QMenu::item:selected,
QPlainTextEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectSelector::indicator:unchecked:selected,
Expand Down Expand Up @@ -239,6 +243,7 @@ WLibraryTextBrowser QMenu,
WTrackMenu,
WTrackMenu QMenu,
QLineEdit QMenu,
QPlainTextEdit QMenu,
WCueMenuPopup,
WCoverArtMenu,
WEffectSelector QAbstractScrollArea,
Expand Down Expand Up @@ -354,7 +359,8 @@ WEffectSelector QAbstractScrollArea,
WTrackMenu::item:disabled,
WTrackMenu QMenu::item:disabled,
WTrackMenu QMenu QCheckBox:disabled,
QLineEdit QMenu::item:disabled {
QLineEdit QMenu::item:disabled,
QPlainTextEdit QMenu::item:disabled {
color: #666;
}
WTrackMenu QMenu QCheckBox::indicator:disabled {
Expand All @@ -367,7 +373,8 @@ WEffectSelector QAbstractScrollArea,
WTrackMenu::separator,
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator {
QLineEdit QMenu::separator,
QPlainTextEdit QMenu::separator {
border-top: 1px solid #71777a;
}

Expand Down Expand Up @@ -498,6 +505,7 @@ WTrackTableView {

/* Table cell in edit mode */
WLibrary QLineEdit,
WLibrary QPlainTextEdit,
#LibraryBPMSpinBox {
color: #ddd;
background-color: #0f0f0f;
Expand Down
13 changes: 8 additions & 5 deletions res/skins/Shade/style_dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ WTrackMenu QMenu::item,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QLineEdit QMenu::item,
QPlainTextEdit QMenu,
QPlainTextEdit QMenu::item,
WBeatSpinBox::up-button,
WBeatSpinBox::down-button,
WCueMenuPopup,
Expand Down Expand Up @@ -61,6 +63,7 @@ WTrackMenu QMenu QCheckBox:selected,
WTrackMenu QMenu QCheckBox:focus,
WTrackMenu QMenu QCheckBox:hover,
QLineEdit QMenu::item:selected,
QPlainTextEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectSelector::indicator:unchecked:selected,
Expand All @@ -84,7 +87,8 @@ WEffectSelector::indicator:unchecked:selected,
WTrackMenu::separator,
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator {
QLineEdit QMenu::separator,
QPlainTextEdit QMenu::separator {
border-top: 1px solid #3F3041;
}
/* checked checkbox */
Expand All @@ -108,7 +112,8 @@ WEffectSelector::indicator:unchecked:selected,
WTrackMenu::item:disabled,
WTrackMenu QMenu::item:disabled,
WTrackMenu QMenu QCheckBox:disabled,
QLineEdit QMenu::item:disabled {
QLineEdit QMenu::item:disabled,
QPlainTextEdit QMenu::item:disabled {
border-color: #444;
color: #444;
}
Expand Down Expand Up @@ -188,14 +193,12 @@ WTrackTableView {

/* Table cell in edit mode */
WLibrary QLineEdit,
WLibrary QPlainTextEdit,
#LibraryBPMSpinBox {
color: #ddd;
background-color: #0f0f0f;
selection-color: #000;
selection-background-color: #aaa;
}
WLibrary QLineEdit,
#LibraryBPMSpinBox {
border: 1px solid #666;
}
#LibraryBPMSpinBox::up-button,
Expand Down
6 changes: 5 additions & 1 deletion res/skins/Shade/style_summer_sunset.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ WTrackMenu QMenu::item,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
QLineEdit QMenu::item,
QPlainTextEdit QMenu,
QPlainTextEdit QMenu::item,
WBeatSpinBox::up-button,
WBeatSpinBox::down-button,
WCueMenuPopup,
Expand Down Expand Up @@ -50,7 +52,8 @@ WBeatSpinBox,
WTrackMenu::separator,
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator {
QLineEdit QMenu::separator,
QPlainTextEdit QMenu::separator {
border-top: 1px solid #222;
}
#MainMenu::item:selected,
Expand All @@ -70,6 +73,7 @@ WTrackMenu QMenu QCheckBox:selected,
WTrackMenu QMenu QCheckBox:focus,
WTrackMenu QMenu QCheckBox:hover,
QLineEdit QMenu::item:selected,
QPlainTextEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectSelector::indicator:unchecked:selected,
Expand Down
Loading