Cancel track rename by pressing Escape key #3676

M374LX · 2017-07-01T14:11:18Z

With this pull request, the user is able to cancel a track rename action by pressing the Escape key.

Also renamed rename_dlg to renameDlg in TrackLabelButton::rename() so it complies to the naming conventions.

Umcaruje · 2017-07-01T18:49:50Z

include/TrackRenameLineEdit.h

+/*
+ * TrackRenameLineEdit.h - class TrackRenameLineEdit
+ *
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>


You should put your name here

Alexandre Almeida <http://m374lx.users.sourceforge.net/>

Umcaruje · 2017-07-01T18:50:15Z

src/gui/widgets/TrackRenameLineEdit.cpp

+ * 							 represents the text field that appears when one
+ *							 double-clicks a track's label to rename it
+ *
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>


Same here, your name

Same as above.

tresf · 2017-07-01T19:31:45Z

stable-1.2 is on a feature freeze, right?

PhysSong · 2017-07-02T02:56:14Z

stable-1.2 is on a feature freeze, right?

@M374LX As @tresf said, stable-1.2 is on a feature freeze. You shouldn't introduce new feature into stable-1.2 unless it is related to a bug fix.
See #3662 (comment).

If many people agrees 1.2.0 needs this, however, it would be fine.

Umcaruje · 2017-07-02T10:21:13Z

include/TrackRenameLineEdit.h

@@ -2,6 +2,7 @@
 * TrackRenameLineEdit.h - class TrackRenameLineEdit
 *
 * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2007 Alexandre Almeida <http://m374lx.users.sourceforge.net/>


You mistyped the date, it's 2017 now 😉

Umcaruje · 2017-07-02T13:44:44Z

stable-1.2 is on a feature freeze, right?
You shouldn't introduce new feature into stable-1.2 unless it is related to a bug fix.

Well, I just checked and when renaming in LMMS 1.1.3 the escape key would close the rename dialog. To that extent, this can be considered a bug fix cause it brings back previous behaviour that was lost with the new feature. I vote this gets into stable-1.2

PhysSong · 2017-07-02T13:51:53Z

Well, I just checked and when renaming in LMMS 1.1.3 the escape key would close the rename dialog.

If it was in previous version of LMMS, I think it could a bug fix. I agree with @Umcaruje.

M374LX · 2017-07-02T13:56:46Z

Also note that the rename dialog still exists in 1.2.0-rc3 when using compact track buttons and the Escape key also cancels it.

Umcaruje · 2017-07-02T13:56:56Z

src/gui/widgets/TrackRenameLineEdit.cpp

+
+
+
+TrackRenameLineEdit::TrackRenameLineEdit( QWidget * _parent ) :


Per the coding conventions: Function parameters are not prefixed with "_" anymore

So this should be parent

Umcaruje · 2017-07-02T14:13:52Z

src/gui/widgets/TrackRenameLineEdit.cpp

+
+
+
+void TrackRenameLineEdit::keyPressEvent( QKeyEvent * _ke )


Same as the previous comment: this should be ke

Umcaruje · 2017-07-02T14:14:57Z

include/TrackRenameLineEdit.h

+{
+	Q_OBJECT
+public:
+	TrackRenameLineEdit( QWidget * _parent );


These should be updated as well.

Umcaruje

Tested this out, looks like a charm, and the code looks good as well. Green light to merge from me 👍

BaraMGB · 2017-07-02T19:28:06Z

src/gui/widgets/TrackRenameLineEdit.cpp

+
+void TrackRenameLineEdit::keyPressEvent( QKeyEvent * ke )
+{
+	if( ke->key() == Qt::Key_Escape ) {


The brace should be in the next line

tresf · 2017-07-03T17:52:48Z

in LMMS 1.1.3 the escape key would close the rename dialog. To that extent, this can be considered a bug fix

Valid point.

zonkmachine

Tests fine and looks good.

PS. When this is merged, please edit the commit message.

Umcaruje · 2017-07-07T12:46:16Z

PS. When this is merged, please edit the commit message.

What do you mean by this?

tresf · 2017-07-07T12:54:30Z

PS. When this is merged, please edit the commit message.

What do you mean by this?

When a PR is squashed and merged it leaves a bunch of unnecessary comments in the history. This one will read:

* Create TrackRenameLineEdit.cpp

* Update TrackLabelButton.cpp

* Update TrackLabelButton.h

* Create TrackRenameLineEdit.h

* Update CMakeLists.txt

* Update TrackRenameLineEdit.cpp

* Update TrackRenameLineEdit.cpp

* Update TrackLabelButton.h

* Update TrackLabelButton.h

* Update TrackRenameLineEdit.h

* Update TrackRenameLineEdit.h

* Update TrackRenameLineEdit.cpp

* Update TrackRenameLineEdit.cpp

* Update TrackRenameLineEdit.h

* Update TrackRenameLineEdit.cpp

He's asking that the person that merges it doesn't leave the default text in there and instead cleans up the commit message on merge. This should be standard action on the merger's part but sometimes we forget to do it due to the small preview window.

Umcaruje · 2017-07-07T13:06:11Z

Oh, thanks for explaining @tresf

Sawuare · 2017-07-15T08:21:43Z

Instrument plug-ins are the only tracks that can be re-named from their own window, will this pull request enable the user to cancel the re-name action from the window by pressing the Esc key?
I mean from here:

PhysSong · 2017-07-15T10:19:05Z

@Hussam-Eddin-Alhomsi No, change from plug-in windows are applied immediately, so can't be canceled by Esc key.

Sawuare · 2017-07-15T10:49:04Z

@PhysSong You're right. Didn't think about that.

With this pull request, the user is able to cancel a track rename action by pressing the Escape key. Also renamed rename_dlg to renameDlg in TrackLabelButton::rename() so it complies to the naming conventions. Fixes LMMS#3675.

Umcaruje reviewed Jul 1, 2017

View reviewed changes

Umcaruje reviewed Jul 2, 2017

View reviewed changes

Umcaruje approved these changes Jul 2, 2017

View reviewed changes

BaraMGB reviewed Jul 2, 2017

View reviewed changes

zonkmachine approved these changes Jul 6, 2017

View reviewed changes

Cancel track rename with Escape key

aa6d528

M374LX force-pushed the stable-1.2 branch from 39018b2 to aa6d528 Compare July 8, 2017 23:01

tresf merged commit 3dfda61 into LMMS:stable-1.2 Jul 14, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel track rename by pressing Escape key #3676

Cancel track rename by pressing Escape key #3676

M374LX commented Jul 1, 2017

Umcaruje Jul 1, 2017

M374LX Jul 1, 2017 •

edited

Loading

Umcaruje Jul 1, 2017

M374LX Jul 1, 2017

tresf commented Jul 1, 2017

PhysSong commented Jul 2, 2017 •

edited

Loading

Umcaruje Jul 2, 2017

Umcaruje commented Jul 2, 2017

PhysSong commented Jul 2, 2017

M374LX commented Jul 2, 2017

Umcaruje Jul 2, 2017

Umcaruje Jul 2, 2017

Umcaruje Jul 2, 2017

Umcaruje left a comment

BaraMGB Jul 2, 2017

tresf commented Jul 3, 2017

zonkmachine left a comment

Umcaruje commented Jul 7, 2017

tresf commented Jul 7, 2017 •

edited

Loading

Umcaruje commented Jul 7, 2017

Sawuare commented Jul 15, 2017

PhysSong commented Jul 15, 2017

Sawuare commented Jul 15, 2017




		TrackRenameLineEdit::TrackRenameLineEdit( QWidget * _parent ) :

Cancel track rename by pressing Escape key #3676

Cancel track rename by pressing Escape key #3676

Conversation

M374LX commented Jul 1, 2017

Choose a reason for hiding this comment

M374LX Jul 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tresf commented Jul 1, 2017

PhysSong commented Jul 2, 2017 • edited Loading

Choose a reason for hiding this comment

Umcaruje commented Jul 2, 2017

PhysSong commented Jul 2, 2017

M374LX commented Jul 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Umcaruje left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tresf commented Jul 3, 2017

zonkmachine left a comment

Choose a reason for hiding this comment

Umcaruje commented Jul 7, 2017

tresf commented Jul 7, 2017 • edited Loading

Umcaruje commented Jul 7, 2017

Sawuare commented Jul 15, 2017

PhysSong commented Jul 15, 2017

Sawuare commented Jul 15, 2017

M374LX Jul 1, 2017 •

edited

Loading

PhysSong commented Jul 2, 2017 •

edited

Loading

tresf commented Jul 7, 2017 •

edited

Loading