GUI: Port to Qt #7

michaelpm54 · 2018-05-22T12:50:23Z

Updates:

Split pthread commit
Fixed ax_check_qt5.m4 indentation
Added verdigris license and readme
Changes to dists/debian/copyright
Changes to authors
Split c++ standard commit
Fixed improper usage of Doxygen comments /** Model functions. */ like this, now looks like // Model functions
Removed newline in Doxygen comments

DrMcCoy

Very nice, this is exactly what I was looking for! :D

There's a few minor things:

Two commits could be split into two each
Comments meant to group methods shouldn't be Doxygen comments (Doxygen just gets confused by them)
There's no need to make a Doxygen comment span two multiple lines if there's no further longer explanation
I'd like some an acknowledgement of Verdigris in the AUTHORS file and the debian copyright file

I marked those in the invididual commits as well.

If you have any problems wrangling git into splitting commits or otherwise changing the history with an interactive git rebase, please say so and I'll change the commits myself.

Otherwise, I very happy with this PR. :)

DrMcCoy · 2018-05-22T14:23:03Z

CMakeLists.txt

@@ -289,6 +280,7 @@ endif()
 set(HAVE_PTHREAD ${CMAKE_USE_PTHREADS_INIT})
 if(CMAKE_USE_PTHREADS_INIT)
  set(PTHREAD_LIBS ${CMAKE_THREAD_LIBS_INIT})
+  list(APPEND PHAETHON_LIBRARIES ${PTHREAD_LIBS})


Can you put the pthread-thing into its own commit, before this one? Because that's technically a separate issue.

DrMcCoy · 2018-05-22T14:23:03Z

m4/ax_check_qt5.m4

+								Qt5Widgets >= $1 \
+								Qt5Multimedia >= $1 \
+								Qt5Concurrent >= $1 \
+							  ], [$2], [$3])


Unfortunately, the indentations here will make this look weird when the configure script runs. So best put this in one long line.

DrMcCoy · 2018-05-22T14:23:03Z

verdigris/rules.mk

+noinst_HEADERS += \
+    verdigris/wobjectdefs.h \
+    verdigris/wobjectimpl.h \
+    $(EMPTY)


Can you also add a README.Phaethon file into the verdigris directory, with the contents

This is the source of Verdigris (<https://github.com/woboq/verdigris>), based on the git revision .

(and the revision you based it on filled in there).

Also, add a section for it in the AUTHORS file (probably right after UTF-8 CPP):

Verdigris ********* Phaethon uses and includes the header-only library Verdigris (<https://github.com/woboq/verdigris>) to use Qt5 without moc. Verdigris is licensed under version 3 or later of the Lesser GNU General Public License. For the full license texts, see LICENSE.LGPLv3 or <https://gnu.org/licenses/lgpl-3.0.html>.

And drop in that license file in plaintext.

Likewise, add the two Verdigris files to dists/debian/copyright:

Files: verdigris/wobjectdefs.h verdigris/wobjectimpl.h Copyright: 2016-2018 Woboq GmbH License: LGPL-3.0+

And you then need a section

License: LGPL-3.0+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . On Debian systems, the complete text of the GNU Library General Public License can be found in the file "/usr/share/common-licenses/LGPL-3".

at the bottom of the copyright file.

This should all go within this commit, please.

DrMcCoy · 2018-05-22T14:23:03Z

configure.ac


 STD=""
 if test "x$with_std" = "xyes"; then
-	AX_CHECK_COMPILER_FLAGS_VAR([C++], [STD], [-std=c++03])
+	AX_CHECK_COMPILER_FLAGS_VAR([C++], [STD], [-std=c++14])


Pushing the C++ standard to C++14 should be it own commit, please.

DrMcCoy · 2018-05-22T14:23:03Z

src/gui/resourcetree.h

+	*/
+	ResourceTreeItem *itemFromIndex(const QModelIndex &index) const;
+
+	/** Model functions. */


Comments to denote a "section" shouldn't be Doxygen comments (i.e. please use /* here instead of /**)

This applies to resourcetreeitem.h as well and further commits as well.

DrMcCoy · 2018-05-22T14:23:03Z

src/gui/resourcetree.h

+	/** Model functions. */
+
+	/** Return the index if it exists, else create it.
+	*/


Please remove these line breaks inside the Doxygen comments here. There's no need to make the comment span two lines.

This applies to resourcetreeitem.h as well and further commits as well.

It was previously provided by wxWidgets.

C++14 is required by Verdigris.

Proxy model is a necessary class for sorting items.

DrMcCoy · 2018-05-22T16:33:40Z

This looks quite good now, yes. I pushed it to the temporary https://github.com/xoreos/phaethon/tree/qttravis branch to see what Travis CI says. :)

How do you want to be credited in the AUTHORS file now? And should I also change your line in the xoreos AUTHORS file?

michaelpm54 · 2018-05-23T08:17:42Z

Michael McAssey <michael.mcassey1@gmail.com>

And yes, please do change the one in xoreos.

DrMcCoy · 2018-05-23T09:26:13Z

Merged as 2dc7e82...7d5b853, thanks! :D

DrMcCoy · 2018-06-23T18:34:38Z

Hmm, is there a reason for the dependency on QtMultimedia? It doesn't seem to be needed, it seems. I mean, we do have our own sound mixer, powered by OpenAL, after all.

I'm currently exploring potentially creating release packages of Phaethon. For Linux, I'm using a Debian chroot (Debian Stretch, for Phaethon). The thing is, the QtMultimedia in Debian pulls in pulseaudio, which pulls in systemd... which is not something I can distribute.

So I'd need to compile Qt myself in the chroot. I'd rather not, honestly. And if that can be prevented by not requiring QtMultimedia, that would make me happy.

michaelpm54 · 2018-06-24T19:09:31Z

I think it's a relic from a previous iteration of phaethon-qt, in which I used it for sound and/or images.
I removed it and everything seems to be working fine.

DrMcCoy requested changes May 22, 2018

View changes

michaelpm54 added 16 commits May 22, 2018

GUI: Remove wxWidgets dependency and GUI code

10693c0

BUILD: Link pthread in CMake build

e69bff5

It was previously provided by wxWidgets.

BUILD: Add Qt5 dependency

a6e2404

BUILD: Add Verdigris

0393122

BUILD: Push C++ standard to C++14

ea63ff2

C++14 is required by Verdigris.

GUI: Add stub for Phaethon's main window

a0c1ed4

GUI: Add menu bar and menu actions

b5c8e50

GUI: Add slots and implement the slots which don't need tree

2f87828

GUI: Add layout structure for main window

54008ea

GUI: Add file tree opening and closing

8cb30aa

Proxy model is a necessary class for sorting items.

GUI: Add status bar

dff42e7

GUI: Add resource info panel

8a9ec8e

GUI: Add empty preview panel

812a676

GUI: Add image preview panel

836e6f0

GUI: Add sound preview panel

92f1ff2

GUI: Add logging for opening and closing

7789379

michaelpm54 force-pushed the michaelpm54:qt branch from 5517bbb to 7789379 May 22, 2018

DrMcCoy closed this May 23, 2018

michaelpm54 deleted the michaelpm54:qt branch Jun 24, 2018

xoreos / phaethon

GUI: Port to Qt #7

GUI: Port to Qt #7

michaelpm54 commented May 22, 2018 •

edited

DrMcCoy left a comment •

edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

DrMcCoy commented May 22, 2018

michaelpm54 commented May 23, 2018

DrMcCoy commented May 23, 2018

DrMcCoy commented Jun 23, 2018 •

edited

michaelpm54 commented Jun 24, 2018

xoreos / phaethon

GUI: Port to Qt #7

GUI: Port to Qt #7

Conversation

michaelpm54 commented May 22, 2018 • edited

DrMcCoy left a comment • edited

This comment has been minimized.

DrMcCoy May 22, 2018 Member

This comment has been minimized.

DrMcCoy May 22, 2018 Member

This comment has been minimized.

DrMcCoy May 22, 2018 Member

This comment has been minimized.

DrMcCoy May 22, 2018 Member

This comment has been minimized.

DrMcCoy May 22, 2018 Member

This comment has been minimized.

DrMcCoy May 22, 2018 Member

DrMcCoy commented May 22, 2018

michaelpm54 commented May 23, 2018

DrMcCoy commented May 23, 2018

DrMcCoy commented Jun 23, 2018 • edited

michaelpm54 commented Jun 24, 2018

michaelpm54 commented May 22, 2018 •

edited

DrMcCoy left a comment •

edited

DrMcCoy May 22, 2018
Member

DrMcCoy May 22, 2018
Member

DrMcCoy May 22, 2018
Member

DrMcCoy May 22, 2018
Member

DrMcCoy May 22, 2018
Member

DrMcCoy May 22, 2018
Member

DrMcCoy commented Jun 23, 2018 •

edited