Add option to use ComboBoxes instead of Tabs and enable re-ordering of documents in the Documents Docklet #2555

LucaDanieli · 2016-12-12T17:48:16Z

Scott Wilson, Scott Carver and I developed the management of the documents in SuperCollider, connecting the Documents Docklet to the TabBar.

Here, 2 new options are added to Preferences->Editor :

Use ComboBox
Convert automatically to ComboBox when splitting

The documents docklet is dynamic and permits the re-ordering of documents. Furthermore, the TabBar and the Documents Docklet always show the documents in the same order, and any re-ordering in the TabBar affects the order of the documents in the docklet (and viceversa).

ComboBoxes are implemented to make clearer what is the document visualised by each split. Following a discussion in 2014, we have sorted each ComboBox alphabetically - to quickly find specific documents in performance.

In this way there are now 3 different types of ordering:

The TabBar and the Documents Docklet automatically order documents by "last opened", letting the user to reorder them;
Each editor has an optional ComboBox with documents sorted in Lexical Order;
ctrl+Tab / ctrl+shift+tab present a list of documents ordered by "last document used".

Update from original

Update branch

clean better implementation using show()/hide()

cleaning

comboBox disappears (if option selected) when removing splits

clean

Tabs connected to Docklet

clean connection from Docklet to Tabs

…collider into ide-rework-sqc

muellmusik · 2017-01-04T15:56:30Z

editors/sc-ide/core/doc_manager.cpp

@@ -353,7 +361,9 @@ Document *DocumentManager::open( const QString & path, int initialCursorPosition
    doc->mDoc->setPlainText( decodeDocument(bytes) );
    doc->mDoc->setModified(false);
    doc->mFilePath = filePath;
-    doc->mTitle = info.fileName();
+    QString fileTitle = info.fileName();
+    doc->mTitle = fileTitle;


This appears to be redundant, as setTitle() also sets the member variable.

muellmusik · 2017-01-04T15:57:00Z

editors/sc-ide/core/doc_manager.cpp

-    doc->mTitle = info.fileName();
+    QString fileTitle = info.fileName();
+    doc->setTitle(fileTitle);
+    doc->mTitle = fileTitle;


This appears to be redundant (see above)

muellmusik · 2017-01-04T15:57:21Z

editors/sc-ide/core/doc_manager.cpp

-            document->mTitle = QString::fromUtf8(title.c_str());
+            QString newTitle = QString::fromUtf8(title.c_str());
+            document->setTitle(newTitle);
+            document->mTitle = newTitle;


This appears to be redundant (see above)

muellmusik · 2017-01-04T15:59:36Z

editors/sc-ide/widgets/code_editor/editor.hpp

@@ -55,7 +55,7 @@ class GenericCodeEditor : public QPlainTextEdit

    void showPosition( int charPosition, int selectionLength = 0 );
    QString symbolUnderCursor();
-    int inactiveFadeAlpha() { return mInactiveFadeAlpha; }
+    int inactiveFadeAlpha() { return mInactiveFadeAlpha; };


The semi-colon is not required here, so I'd undo this change to avoid adding noise to git blame.

muellmusik · 2017-01-04T16:01:52Z

editors/sc-ide/widgets/doc_list.hpp

@@ -91,6 +97,7 @@ class DocumentsDocklet : public Docklet
 private:

    DocumentListWidget *mDocList;
+


I'd lose this line, as it's just additional unnecessary whitespace

telephon · 2017-01-04T20:07:23Z

maybe solves this (?): #2612

muellmusik · 2017-01-05T10:41:18Z

@LucaDanieli, that's good. Before merging we should just do a clean PR which combines those adjustments with the original commits (I can show you how) in order to avoid polluting the commit log with no-ops.

Any other comments on this?

nhthn · 2017-01-13T17:29:08Z

I understand this mostly, but I'm not clear on what is meant by "Convert automatically to ComboBox when splitting." What is a "split"?

LucaDanieli · 2017-01-13T17:37:37Z

Hi Nathan.

Splitting is the ability to "split" the editor docklet into many editors, so to show different documents at once. You can find if in "view->split to right, view->split to bottom".

Previously, all splits were sharing the same tab bar. This could be confusing. So, we wanted to add the possibility of making clearer the association document/editor for each split, providing the option to keep the original behaviour.

nhthn · 2017-01-13T17:57:47Z

Ok, makes sense. Thanks for your work on this. I've filed a PR (#2639) to reword some of the checkboxes so they're easier to understand at a glance.

mossheim · 2017-01-13T18:04:52Z

I think this was merged prematurely. There are a couple of issues:

The preferences options are vague, especially "Use ComboBox"
The proper name for this graphical element is a drop-down or drop-down list.
If I have two editors (one split) with the tab bar active and apply the "Use ComboBox" option, nothing happens.
If I have "Use ComboBox" checked and not "Convert automatically to ComboBox when splitting" when I activate a split, I have a tab bar instead of combo boxes now.
Is Ctrl in Ctrl+Tab and Ctrl+Shift+Tab meant to be Cmd on macOS? Ctrl+Tab does nothing for me.

mossheim · 2017-01-13T18:09:39Z

Not sure how you want to fix this re: separate issues or PRs so I thought I would just raise them here first.

LucaDanieli · 2017-01-13T19:07:15Z

Thank you Brian for your review.

About the first two points: I am not English mothertongue and for me naming things is one of the most difficult things. I apologise.
About point 3 and 4: I can fix that now. Should I push to this branch? Or should I push to PR(#2639), Nathan?
About point 5: Yes, it is Cmd+Tab and Cmd+Shift+Tab

nhthn · 2017-01-13T19:09:22Z

@LucaDanieli I think you should just keep working on this branch.

mossheim · 2017-01-13T19:14:42Z

@LucaDanieli

About the first two points: I am not English mothertongue and for me naming things is one of the most difficult things. I apologise.

No need to apologize, this is a fantastic feature and I'm really glad you guys added it! Text strings are the easiest things to change so it's no big deal. :)

About point 5: Yes, it is Cmd+Tab and Cmd+Shift+Tab

Unfortunately these are macOS-specific commands for moving between applications, similar to Alt+Tab on Linux and Windows, so they won't be useful to most macOS users. In fact, you could probably just add some code to change it to Alt+(Shift+)Tab for macOS specifically--I don't think there are any common macOS commands with that shortcut.

LucaDanieli · 2017-01-13T19:25:54Z

@brianlheim

The Ctrl+Tab shortcut was already implemented, so I thought it was already working on different platforms. @muellmusik can you check what is the shortcut in Mac for switching among "last documents used"? This menu was working on your Mac, if I remember well.

LucaDanieli · 2017-01-13T19:31:14Z

I didn't know how to cue the fix in this PR, so the fix is in this PR: #2641

mossheim · 2017-01-13T19:49:38Z

@LucaDanieli @muellmusik My apologies, the shortcut for macOS is already Alt+(Shift+)Tab, and I can see that now looking at the View menu in my running build. So that should be documented in the changelog, but there's nothing to change in the code. Thanks for helping to clear that up!

LucaDanieli added 27 commits October 24, 2016 09:20

Merge pull request #1 from supercollider/master

1ba6e97

Update from original

Merge pull request #2 from supercollider/master

ebfef7b

Update branch

add option in preferences for enable ComboBox

c23777e

add comboBox and connect to preferences

a5f6c70

clean

5f407ca

better implementation using show()/hide()

6705506

show/hide tabs depending on settings

6b8923a

cleaning

2305606

automatic (temporary) ComboBox mode when splitting

20618f0

comboBox disappears (if option selected) when removing splits

ed91c2f

add option to use dynamic combobox

5486c92

clean

08ef852

enable drag&drop in DocumentDocklet and connect to Tabs

c19e42d

Tabs connected to Docklet

4c08efc

connect qComboBox and DocumentsDocklet

200fd60

clean connection from Docklet to Tabs

7d6fda0

solve bug removeAllSplits

db122ea

restore ComboBoxOption for switchSession

2425d06

add comboBox and connect to preferences

357107d

clean better implementation using show()/hide()

show/hide tabs depending on settings

bfc6247

cleaning

automatic (temporary) ComboBox mode when splitting

7cd8c00

comboBox disappears (if option selected) when removing splits

add option to use dynamic combobox

56b8a27

clean

enable drag&drop in DocumentDocklet and connect to Tabs

99c51d6

Tabs connected to Docklet

connect qComboBox and DocumentsDocklet

e61dbfe

clean connection from Docklet to Tabs

solve bug removeAllSplits

016e174

restore ComboBoxOption for switchSession

b0286d6

Merge branch 'ide-rework-sqc' of https://github.com/LucaDanieli/super…

eca501b

…collider into ide-rework-sqc

LucaDanieli changed the title ~~Ide rework sqc~~ Add option to use ComboBoxes instead of Tabs and enable re-ordering of documents in the Documents Docklet Dec 12, 2016

nhthn added the env: SCIDE label Dec 15, 2016

nhthn added this to the 3.9 milestone Dec 15, 2016

LucaDanieli mentioned this pull request Dec 19, 2016

re-designing the supercollider UI using qtquick in qml (gpu accelerated currently via OpenGL, Vulkan Render coming soon) #2559

Closed

muellmusik approved these changes Jan 4, 2017

View reviewed changes

LucaDanieli force-pushed the ide-rework-sqc branch from 7cfbd07 to eca501b Compare January 4, 2017 19:21

LucaDanieli added 2 commits January 4, 2017 19:23

clean unnecessary things

43f6056

remove unnecessary code

9e76985

muellmusik merged commit 54ae367 into supercollider:master Jan 13, 2017

nhthn mentioned this pull request Jan 13, 2017

ide: reword "Use ComboBox" options #2639

Merged

mossheim mentioned this pull request Jun 9, 2017

IDE: Failed assert: "QSortFilterProxyModel: index from wrong model passed to mapFromSource" #2934

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add option to use ComboBoxes instead of Tabs and enable re-ordering of documents in the Documents Docklet #2555

Add option to use ComboBoxes instead of Tabs and enable re-ordering of documents in the Documents Docklet #2555

LucaDanieli commented Dec 12, 2016 •

edited

Loading

muellmusik Jan 4, 2017

muellmusik Jan 4, 2017

muellmusik Jan 4, 2017

muellmusik Jan 4, 2017

muellmusik Jan 4, 2017

telephon commented Jan 4, 2017

muellmusik commented Jan 5, 2017

nhthn commented Jan 13, 2017

LucaDanieli commented Jan 13, 2017 •

edited

Loading

nhthn commented Jan 13, 2017

mossheim commented Jan 13, 2017

mossheim commented Jan 13, 2017

LucaDanieli commented Jan 13, 2017

nhthn commented Jan 13, 2017

mossheim commented Jan 13, 2017 •

edited

Loading

LucaDanieli commented Jan 13, 2017 •

edited

Loading

LucaDanieli commented Jan 13, 2017 •

edited

Loading

mossheim commented Jan 13, 2017

		@@ -91,6 +97,7 @@ class DocumentsDocklet : public Docklet
		private:

		DocumentListWidget *mDocList;

Add option to use ComboBoxes instead of Tabs and enable re-ordering of documents in the Documents Docklet #2555

Add option to use ComboBoxes instead of Tabs and enable re-ordering of documents in the Documents Docklet #2555

Conversation

LucaDanieli commented Dec 12, 2016 • edited Loading

muellmusik Jan 4, 2017

Choose a reason for hiding this comment

muellmusik Jan 4, 2017

Choose a reason for hiding this comment

muellmusik Jan 4, 2017

Choose a reason for hiding this comment

muellmusik Jan 4, 2017

Choose a reason for hiding this comment

muellmusik Jan 4, 2017

Choose a reason for hiding this comment

telephon commented Jan 4, 2017

muellmusik commented Jan 5, 2017

nhthn commented Jan 13, 2017

LucaDanieli commented Jan 13, 2017 • edited Loading

nhthn commented Jan 13, 2017

mossheim commented Jan 13, 2017

mossheim commented Jan 13, 2017

LucaDanieli commented Jan 13, 2017

nhthn commented Jan 13, 2017

mossheim commented Jan 13, 2017 • edited Loading

LucaDanieli commented Jan 13, 2017 • edited Loading

LucaDanieli commented Jan 13, 2017 • edited Loading

mossheim commented Jan 13, 2017

LucaDanieli commented Dec 12, 2016 •

edited

Loading

LucaDanieli commented Jan 13, 2017 •

edited

Loading

mossheim commented Jan 13, 2017 •

edited

Loading

LucaDanieli commented Jan 13, 2017 •

edited

Loading

LucaDanieli commented Jan 13, 2017 •

edited

Loading