TAPAAL

Merge lp:~tapaal-contributor/tapaal/sort-button-behaviour-1780121 into lp:tapaal

  1. sort-button-behaviour-1780121
  2. Merge into trunk
Proposed by Peter Haahr Taankvist
Status: Merged
Approved by: Jiri Srba
Approved revision: 980
Merged at revision: 980
Proposed branch: lp:~tapaal-contributor/tapaal/sort-button-behaviour-1780121
Merge into: lp:tapaal
Diff against target: 154 lines (+35/-4)
4 files modified
src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java (+14/-1)
src/dk/aau/cs/gui/TemplateExplorer.java (+6/-1)
src/pipe/gui/widgets/ConstantsPane.java (+6/-1)
src/pipe/gui/widgets/QueryPane.java (+9/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/sort-button-behaviour-1780121
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+362213@code.launchpad.net

Description of the change

The sort button in the sidepane now greys out when it is not usable I.E. when there are 1 or less elements in the list.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) wrote :

Works fine. Will merge to trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java'
2--- src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java 2017-03-12 00:33:00 +0000
3+++ src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java 2019-01-24 20:07:27 +0000
4@@ -158,11 +158,21 @@
5 moveDownButton.setEnabled(true);
6 else
7 moveDownButton.setEnabled(false);
8+
9+ if (sharedTransitionsListModel.getSize() >=2) {
10+ sortButton.setEnabled(true);
11+ } else
12+ sortButton.setEnabled(false);
13 } else {
14 if(index < sharedPlacesListModel.getSize() - 1)
15 moveDownButton.setEnabled(true);
16 else
17 moveDownButton.setEnabled(false);
18+
19+ if (sharedPlacesListModel.getSize() >=2) {
20+ sortButton.setEnabled(true);
21+ } else
22+ sortButton.setEnabled(false);
23 }
24 }
25 }
26@@ -238,7 +248,7 @@
27 //Sort button
28 sortButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Sort.png")));
29 sortButton.setToolTipText(toolTipSortPlaces);
30- sortButton.setEnabled(true);
31+ sortButton.setEnabled(false);
32 sortButton.addActionListener(new ActionListener() {
33 public void actionPerformed(ActionEvent e) {
34 if(isDisplayingTransitions()){
35@@ -294,6 +304,7 @@
36 } else {
37 moveDownButton.setEnabled(false);
38 moveUpButton.setEnabled(false);
39+ sortButton.setEnabled(false);
40 }
41 if (list.getModel().getSize() <= 0){
42 renameButton.setEnabled(false);
43@@ -502,6 +513,7 @@
44 if(numElements <= 1) {
45 moveDownButton.setEnabled(false);
46 moveUpButton.setEnabled(false);
47+ sortButton.setEnabled(false);
48 }
49 if (numElements <= 0) {
50 removeButton.setEnabled(false);
51@@ -581,6 +593,7 @@
52 if(numElements <= 1) {
53 moveDownButton.setEnabled(false);
54 moveUpButton.setEnabled(false);
55+ sortButton.setEnabled(false);
56 }
57 if (numElements <= 0) {
58 removeButton.setEnabled(false);
59
60=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
61--- src/dk/aau/cs/gui/TemplateExplorer.java 2018-05-26 14:25:41 +0000
62+++ src/dk/aau/cs/gui/TemplateExplorer.java 2019-01-24 20:07:27 +0000
63@@ -295,7 +295,7 @@
64 //Sort button
65 sortButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Sort.png")));
66 sortButton.setToolTipText(toolTipSortComponents);
67- sortButton.setEnabled(true);
68+ sortButton.setEnabled(false);
69 sortButton.addActionListener(new ActionListener() {
70 public void actionPerformed(ActionEvent e) {
71 Command command = new SortTemplatesCommand(parent, TemplateExplorer.this, templateList, listModel);
72@@ -988,6 +988,7 @@
73 copyButton.setEnabled(false);
74 moveUpButton.setEnabled(false);
75 moveDownButton.setEnabled(false);
76+ sortButton.setEnabled(false);
77 } else {
78 if (buttonPanel != null) {
79 if (CreateGui.getCurrentTab().numberOfActiveTemplates() > 1){
80@@ -1001,6 +1002,10 @@
81 }
82 renameButton.setEnabled(true);
83 copyButton.setEnabled(true);
84+ if(templateList.getModel().getSize() >= 2)
85+ sortButton.setEnabled(true);
86+ else
87+ sortButton.setEnabled(false);
88
89 if(index > 0)
90 moveUpButton.setEnabled(true);
91
92=== modified file 'src/pipe/gui/widgets/ConstantsPane.java'
93--- src/pipe/gui/widgets/ConstantsPane.java 2018-05-13 14:57:15 +0000
94+++ src/pipe/gui/widgets/ConstantsPane.java 2019-01-24 20:07:27 +0000
95@@ -105,6 +105,11 @@
96 removeBtn.setEnabled(true);
97 editBtn.setEnabled(true);
98 }
99+
100+ if (constantsList.getModel().getSize() >= 2) {
101+ sortButton.setEnabled(true);
102+ } else
103+ sortButton.setEnabled(false);
104
105 int index = constantsList.getSelectedIndex();
106 if(index > 0)
107@@ -363,7 +368,7 @@
108 //Sort button
109 sortButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Sort.png")));
110 sortButton.setToolTipText(toolTipSortConstants);
111- sortButton.setEnabled(true);
112+ sortButton.setEnabled(false);
113 sortButton.addActionListener(new ActionListener() {
114 public void actionPerformed(ActionEvent e) {
115 Command sortConstantsCommand = new SortConstantsCommand(parent, ConstantsPane.this);
116
117=== modified file 'src/pipe/gui/widgets/QueryPane.java'
118--- src/pipe/gui/widgets/QueryPane.java 2018-05-20 16:51:09 +0000
119+++ src/pipe/gui/widgets/QueryPane.java 2019-01-24 20:07:27 +0000
120@@ -170,11 +170,18 @@
121 editQueryButton.setEnabled(false);
122 verifyButton.setEnabled(false);
123 removeQueryButton.setEnabled(false);
124+ sortButton.setEnabled(false);
125 } else {
126 editQueryButton.setEnabled(true);
127 verifyButton.setEnabled(true);
128 removeQueryButton.setEnabled(true);
129+ sortButton.setEnabled(true);
130 }
131+ if(queryList.getModel().getSize() >= 2)
132+ sortButton.setEnabled(true);
133+ else
134+ sortButton.setEnabled(false);
135+
136 int index = queryList.getSelectedIndex();
137 if(index > 0 && queryList.getSelectedIndices().length == 1)
138 moveUpButton.setEnabled(true);
139@@ -248,7 +255,7 @@
140 //Sort button
141 sortButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Sort.png")));
142 sortButton.setToolTipText(toolTipSortQueries);
143- sortButton.setEnabled(true);
144+ sortButton.setEnabled(false);
145 sortButton.addActionListener(new ActionListener() {
146 public void actionPerformed(ActionEvent e) {
147 Command c = new SortQueriesCommand(listModel);
148@@ -344,6 +351,7 @@
149 undoManager.addNewEdit(new AddQueryCommand(q, tabContent));
150 addQuery(q);
151 }
152+ updateQueryButtons();
153 }
154 });
155

Subscribers

People subscribed via source and target branches