[gui] smartplaylisteditor: convert spinners etc to regular buttons #10594

phil65 · 2016-09-29T23:51:12Z

Next one...this time the order-by button in Smartplaylisteditor.
this PR adds the same header file to GUIDialogSmartPlaylistEditor.cpp as #10593, so remind me to update the PR which gets pulled last. :)
Could have put all commits into one big PR, so sorry for the additional pinging.

EDIT: all PRs merged into this one.

EDIT: FInished!

mention-bot · 2016-09-29T23:51:13Z

@phil65, thank you for improving Kodi! According to the last 5 commits, we found the potential reviewers: @Montellese, @mkortstiege and @notspiff. Final approval needs to be given by the component maintainer.

phil65 · 2016-09-30T01:31:39Z

Added another commit which converts two more buttons.
If it helps testing or whatever I could also merge the other PR´s into this one.

MilhouseVH · 2016-09-30T01:35:19Z

Merge them (10593 and 10594) and I'll include them both in test builds - keeping them separate makes that a bit trickier (as they're both patching the same code).

phil65 · 2016-09-30T01:38:14Z

@MilhouseVH done.
This also includes now #10592, #10593 and #10589

MilhouseVH · 2016-09-30T02:14:47Z

Thanks, will include in the next build.

phil65 · 2016-09-30T02:37:43Z

...aaand another commit.

…tton controls

…m commit fc87499) (cherry picked from commit beec752)

(cherry picked from commit e6daef4)

(cherry picked from commit 3d7fb0e)

(cherry picked from commit 37babb0)

(cherry picked from commit a3ad5a3)

…me refactoring

Montellese

Looks good apart from the minors. This will require all skins to adjust the dialog right?

xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp

+{ 
+  if (item == static_cast<int>(m_playlist.m_ruleCombination.m_rules.size()))
+    OnRuleAdd();
+  else if (item < 0 || item > static_cast<int>(m_playlist.m_ruleCombination.m_rules.size()))


xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp

+  else
+  {
+    CSmartPlaylistRule rule = *std::static_pointer_cast<CSmartPlaylistRule>(m_playlist.m_ruleCombination.m_rules[item]);
+    if (CGUIDialogSmartPlaylistRule::EditRule(rule,m_playlist.GetType()))


xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp

-  CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), CONTROL_LIMIT);
-  OnMessage(msg);
-  m_playlist.m_limit = msg.GetParam1();
+  const int limits[] = {0, 10, 25, 50, 100, 250, 500, 1000, -1 };


xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp

+void CGUIDialogSmartPlaylistEditor::OnName()
+{
+  std::string name = m_playlist.m_playlistName;
+  if (CGUIKeyboardFactory::ShowAndGetInput(name, CVariant{g_localizeStrings.Get(16012)}, false))


xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp

@@ -546,6 +548,37 @@ void CGUIDialogSmartPlaylistEditor::HighlightItem(int item)
  OnMessage(msg);
 }

+std::vector<CGUIDialogSmartPlaylistEditor::PLAYLIST_TYPE> CGUIDialogSmartPlaylistEditor::GetAllowedTypes(std::string mode)


xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp

+  dialog->Reset();
+  dialog->SetHeading(CVariant{20427});
+  int selected = -1;
+  for (unsigned int i = 0; i < fields.size(); i++)


xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp

+  if (!isValid)
+    m_rule.m_operator = (CDatabaseQueryRule::SEARCH_OPERATOR)std::get<1>(validOperators[0]);
+  m_rule.SetParameter("");
+  UpdateButtons();


xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp

+
+void CGUIDialogSmartPlaylistRule::OnOperator()
+{
+


xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp

+{
+
+  std::vector< std::pair<std::string, int> > labels = GetValidOperators(m_rule);
+  CGUIDialogSelect* dialog = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);


xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp

+void CGUIDialogSmartPlaylistRule::OnOperator()
+{
+
+  std::vector< std::pair<std::string, int> > labels = GetValidOperators(m_rule);


phil65 · 2016-10-01T17:49:56Z

@Montellese
addressed all of your comments in a separate commit, except for the loops, see question above.
Also added two more casts to get rid of some compiler warnings.
Yes, this needs some trivial changes for all skins.

xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp

@@ -546,6 +549,37 @@ void CGUIDialogSmartPlaylistEditor::HighlightItem(int item)
  OnMessage(msg);
 }

+std::vector<CGUIDialogSmartPlaylistEditor::PLAYLIST_TYPE> CGUIDialogSmartPlaylistEditor::GetAllowedTypes(const std::string& mode)
+{


phil65 · 2016-10-02T21:16:12Z

@Montellese switched to using iterators. Anything else?
Thx for reviewing.

phil65 · 2016-10-04T19:21:24Z

jenkins build this please

phil65 · 2016-10-05T20:33:56Z

@Montellese general skinner´s sentiment was to merge this, even though we´re already in a later beta, since needed skin changes are very trivial and our skinners are quite good in keeping up with these changes. Are you fine with this?

Montellese · 2016-10-06T17:24:50Z

Fine with me but don't forget to squash the cleanup commit(s).

phil65 · 2016-10-06T19:49:01Z

All follow-up stuff squashed into one commit.
jenkins build this please.

jingai · 2017-01-10T05:46:33Z

Why was the Order button (id=19 in SmartPlaylistEditor.xml) changed from togglebutton to button? It only toggles between two values.

phil65 changed the title ~~Playlistorder spinner~~ [gui] change order-by selection from spinner to selectdialog Sep 29, 2016

phil65 force-pushed the playlistorder_spinner branch from 3b33eae to 77ea84a Compare September 30, 2016 01:24

This was referenced Sep 30, 2016

[gui] change group-by selection from spinner to selectdialog #10593

Closed

[gui] change rule type selection from spinner to selectdialog #10592

Closed

phil65 changed the title ~~[gui] change order-by selection from spinner to selectdialog~~ [gui] smartplaylisteditor: convert spinners etc to regular buttons Sep 30, 2016

phil65 mentioned this pull request Sep 30, 2016

[gui] Always show "Add rule" item in smartplaylisteditor rule list #10589

Closed

phil65 force-pushed the playlistorder_spinner branch 4 times, most recently from 7393ad2 to d7a93f4 Compare September 30, 2016 04:27

phil65 added 13 commits September 30, 2016 06:36

[gui] change order-by selection from spinner to selectdialog

4856c34

[estuary] change button type for order-by to "button"

4352500

[gui] smartplaylisteditor: change another two buttons to "regular" bu…

d82d337

…tton controls

SmartPlaylistEditor.xml - add missing 'add rule' button (reverted fro…

58316a8

…m commit fc87499) (cherry picked from commit beec752)

[gui] Always show "Add rule" button in smartplaylisteditor rule list

5fb8940

(cherry picked from commit e6daef4)

[estuary] change smartplaylistrule button type to "button"

70f733f

(cherry picked from commit 3d7fb0e)

[gui] change rule type selection from spinner to selectdialog

025b26f

(cherry picked from commit 37babb0)

[gui] change group-by selection from spinner to selectdialog

7a788a0

[estuary] change button type for group-by to "button"

fa6ea53

(cherry picked from commit a3ad5a3)

[gui] change button type for playlist type selection to "button" + so…

71ccc90

…me refactoring

[gui] change playlist limit selection to "button"

e4075d2

[gui] smartplaylisteditor: change edit control to "button"

a5b7350

[estuary] - adjust smartplaylisteditor layout

1489216

phil65 force-pushed the playlistorder_spinner branch from d7a93f4 to 1489216 Compare September 30, 2016 04:38

[gui] smartplaylisteditor: change operator button type to "button"

9053821

phil65 force-pushed the playlistorder_spinner branch 2 times, most recently from ca4dde2 to 89e07d7 Compare September 30, 2016 07:27

Montellese requested changes Oct 1, 2016

View reviewed changes

phil65 commented Oct 1, 2016

View reviewed changes

phil65 force-pushed the playlistorder_spinner branch 2 times, most recently from 3b1196e to 03c1348 Compare October 2, 2016 21:14

phil65 force-pushed the playlistorder_spinner branch from 03c1348 to 03dbc20 Compare October 4, 2016 19:08

Montellese added Type: Improvement non-breaking change which improves existing functionality API change: GUI labels Oct 6, 2016

[gui] SmartPlaylistEditor: some refactoring and code improvements

46ff271

phil65 force-pushed the playlistorder_spinner branch from 03dbc20 to 46ff271 Compare October 6, 2016 19:46

phil65 added the v17 Krypton label Oct 6, 2016

phil65 merged commit 0aacf5c into xbmc:master Oct 6, 2016

phil65 deleted the playlistorder_spinner branch October 6, 2016 23:01

MartijnKaijser modified the milestone: Krypton 17.0-beta4 Oct 7, 2016

jingai mentioned this pull request Jan 10, 2017

Most buttons in both SmartPlaylistEditor.xml and SmartPlaylistRule.xml were converted to regular "button" controls jingai/skin.metropolis#129

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[gui] smartplaylisteditor: convert spinners etc to regular buttons #10594

[gui] smartplaylisteditor: convert spinners etc to regular buttons #10594

phil65 commented Sep 29, 2016 •

edited

mention-bot commented Sep 29, 2016

phil65 commented Sep 30, 2016

MilhouseVH commented Sep 30, 2016 •

edited

phil65 commented Sep 30, 2016 •

edited

MilhouseVH commented Sep 30, 2016

phil65 commented Sep 30, 2016

Montellese left a comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

phil65 commented Oct 1, 2016 •

edited

This comment was marked as spam.

phil65 commented Oct 2, 2016

phil65 commented Oct 4, 2016

phil65 commented Oct 5, 2016

Montellese commented Oct 6, 2016

phil65 commented Oct 6, 2016

jingai commented Jan 10, 2017

[gui] smartplaylisteditor: convert spinners etc to regular buttons #10594

[gui] smartplaylisteditor: convert spinners etc to regular buttons #10594

Conversation

phil65 commented Sep 29, 2016 • edited

mention-bot commented Sep 29, 2016

phil65 commented Sep 30, 2016

MilhouseVH commented Sep 30, 2016 • edited

phil65 commented Sep 30, 2016 • edited

MilhouseVH commented Sep 30, 2016

phil65 commented Sep 30, 2016

Montellese left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

phil65 commented Oct 1, 2016 • edited

This comment was marked as spam.

phil65 commented Oct 2, 2016

phil65 commented Oct 4, 2016

phil65 commented Oct 5, 2016

Montellese commented Oct 6, 2016

phil65 commented Oct 6, 2016

jingai commented Jan 10, 2017

phil65 commented Sep 29, 2016 •

edited

MilhouseVH commented Sep 30, 2016 •

edited

phil65 commented Sep 30, 2016 •

edited

phil65 commented Oct 1, 2016 •

edited