[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/update-about into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371894 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Review: Approve Again -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371894 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/update-about into
lp:openlp.
Commit message:
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
Requested reviews:
Tomas Groth (tomasgroth)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371894
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2019-08-18 09:15:51 +
+++ openlp/core/ui/aboutdialog.py 2019-08-27 16:29:09 +
@@ -41,21 +41,33 @@
"""
about_dialog.setObjectName('about_dialog')
about_dialog.setWindowIcon(UiIcons().main_icon)
-self.about_dialog_layout = QtWidgets.QVBoxLayout(about_dialog)
-self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
-self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout = QtWidgets.QVBoxLayout(about_dialog)
+self.base_layout.setContentsMargins(0, 0, 0, 0)
+self.base_layout.setSpacing(0)
+self.base_layout.setObjectName('base_layout')
self.logo_label = QtWidgets.QLabel(about_dialog)
self.logo_label.setPixmap(QtGui.QPixmap(':/graphics/openlp-about-logo.png'))
+self.logo_label.setStyleSheet('background-color: #fff')
+self.logo_label.setMargin(8)
self.logo_label.setObjectName('logo_label')
-self.about_dialog_layout.addWidget(self.logo_label)
+self.base_layout.addWidget(self.logo_label)
+self.line = QtWidgets.QFrame(about_dialog)
+self.line.setFrameShape(QtWidgets.QFrame.HLine)
+self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+self.line.setObjectName('line')
+self.base_layout.addWidget(self.line)
+self.about_dialog_layout = QtWidgets.QVBoxLayout()
+self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
+self.about_dialog_layout.setSpacing(8)
+self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout.addLayout(self.about_dialog_layout)
self.about_notebook = QtWidgets.QTabWidget(about_dialog)
self.about_notebook.setObjectName('about_notebook')
self.about_tab = QtWidgets.QWidget()
self.about_tab.setObjectName('about_tab')
self.about_tab_layout = QtWidgets.QVBoxLayout(self.about_tab)
self.about_tab_layout.setObjectName('about_tab_layout')
-self.about_text_edit = QtWidgets.QPlainTextEdit(self.about_tab)
-self.about_text_edit.setReadOnly(True)
+self.about_text_edit = QtWidgets.QTextBrowser(self.about_tab)
self.about_text_edit.setObjectName('about_text_edit')
self.about_tab_layout.addWidget(self.about_text_edit)
self.about_notebook.addTab(self.about_tab, '')
@@ -63,8 +75,7 @@
self.credits_tab.setObjectName('credits_tab')
self.credits_tab_layout = QtWidgets.QVBoxLayout(self.credits_tab)
self.credits_tab_layout.setObjectName('credits_tab_layout')
-self.credits_text_edit = QtWidgets.QPlainTextEdit(self.credits_tab)
-self.credits_text_edit.setReadOnly(True)
+self.credits_text_edit = QtWidgets.QTextBrowser(self.credits_tab)
self.credits_text_edit.setObjectName('credits_text_edit')
self.credits_tab_layout.addWidget(self.credits_text_edit)
self.about_notebook.addTab(self.credits_tab, '')
@@ -72,14 +83,13 @@
self.license_tab.setObjectName('license_tab')
self.license_tab_layout = QtWidgets.QVBoxLayout(self.license_tab)
self.license_tab_layout.setObjectName('license_tab_layout')
-self.license_text_edit = QtWidgets.QPlainTextEdit(self.license_tab)
-self.license_text_edit.setReadOnly(True)
+self.license_text_edit = QtWidgets.QTextBrowser(self.license_tab)
self.license_text_edit.setObjectName('license_text_edit')
self.license_tab_layout.addWidget(self.license_text_edit)
self.about_notebook.addTab(self.license_tab, '')
self.about_dialog_layout.addWidget(self.about_notebook)
-self.volunteer_button = create_button(None, 'volunteer_button', icon=UiIcons().volunteer)
-self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.volunteer_button])
+self.contribute_button = create_button(None, 'contribute_button', icon=UiIcons().volunteer)
+self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.contribute_button])
self.about_dialog_layout.addWidget(self.button_box)
self.retranslate_ui(about_dialog)
self.about_notebook.setCurrentIndex(0)
@@ -91,618 +101,647 @@
:param
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/update-about into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371882 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Approved -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371882 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/update-about into
lp:openlp.
Commit message:
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
Requested reviews:
Tomas Groth (tomasgroth)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371882
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2019-08-18 09:15:51 +
+++ openlp/core/ui/aboutdialog.py 2019-08-27 14:45:37 +
@@ -41,21 +41,33 @@
"""
about_dialog.setObjectName('about_dialog')
about_dialog.setWindowIcon(UiIcons().main_icon)
-self.about_dialog_layout = QtWidgets.QVBoxLayout(about_dialog)
-self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
-self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout = QtWidgets.QVBoxLayout(about_dialog)
+self.base_layout.setContentsMargins(0, 0, 0, 0)
+self.base_layout.setSpacing(0)
+self.base_layout.setObjectName('base_layout')
self.logo_label = QtWidgets.QLabel(about_dialog)
self.logo_label.setPixmap(QtGui.QPixmap(':/graphics/openlp-about-logo.png'))
+self.logo_label.setStyleSheet('background-color: #fff')
+self.logo_label.setMargin(8)
self.logo_label.setObjectName('logo_label')
-self.about_dialog_layout.addWidget(self.logo_label)
+self.base_layout.addWidget(self.logo_label)
+self.line = QtWidgets.QFrame(about_dialog)
+self.line.setFrameShape(QtWidgets.QFrame.HLine)
+self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+self.line.setObjectName('line')
+self.base_layout.addWidget(self.line)
+self.about_dialog_layout = QtWidgets.QVBoxLayout()
+self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
+self.about_dialog_layout.setSpacing(8)
+self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout.addLayout(self.about_dialog_layout)
self.about_notebook = QtWidgets.QTabWidget(about_dialog)
self.about_notebook.setObjectName('about_notebook')
self.about_tab = QtWidgets.QWidget()
self.about_tab.setObjectName('about_tab')
self.about_tab_layout = QtWidgets.QVBoxLayout(self.about_tab)
self.about_tab_layout.setObjectName('about_tab_layout')
-self.about_text_edit = QtWidgets.QPlainTextEdit(self.about_tab)
-self.about_text_edit.setReadOnly(True)
+self.about_text_edit = QtWidgets.QTextBrowser(self.about_tab)
self.about_text_edit.setObjectName('about_text_edit')
self.about_tab_layout.addWidget(self.about_text_edit)
self.about_notebook.addTab(self.about_tab, '')
@@ -63,8 +75,7 @@
self.credits_tab.setObjectName('credits_tab')
self.credits_tab_layout = QtWidgets.QVBoxLayout(self.credits_tab)
self.credits_tab_layout.setObjectName('credits_tab_layout')
-self.credits_text_edit = QtWidgets.QPlainTextEdit(self.credits_tab)
-self.credits_text_edit.setReadOnly(True)
+self.credits_text_edit = QtWidgets.QTextBrowser(self.credits_tab)
self.credits_text_edit.setObjectName('credits_text_edit')
self.credits_tab_layout.addWidget(self.credits_text_edit)
self.about_notebook.addTab(self.credits_tab, '')
@@ -72,14 +83,13 @@
self.license_tab.setObjectName('license_tab')
self.license_tab_layout = QtWidgets.QVBoxLayout(self.license_tab)
self.license_tab_layout.setObjectName('license_tab_layout')
-self.license_text_edit = QtWidgets.QPlainTextEdit(self.license_tab)
-self.license_text_edit.setReadOnly(True)
+self.license_text_edit = QtWidgets.QTextBrowser(self.license_tab)
self.license_text_edit.setObjectName('license_text_edit')
self.license_tab_layout.addWidget(self.license_text_edit)
self.about_notebook.addTab(self.license_tab, '')
self.about_dialog_layout.addWidget(self.about_notebook)
-self.volunteer_button = create_button(None, 'volunteer_button', icon=UiIcons().volunteer)
-self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.volunteer_button])
+self.contribute_button = create_button(None, 'contribute_button', icon=UiIcons().volunteer)
+self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.contribute_button])
self.about_dialog_layout.addWidget(self.button_box)
self.retranslate_ui(about_dialog)
self.about_notebook.setCurrentIndex(0)
@@ -91,618 +101,647 @@
:param
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/update-about into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Sure, can do. -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Review: Needs Fixing Since we on windows and Mac actually bundle the software we give credit to, I think we need to include which license each dependency has. Maybe like this: Qt5 (LGPL3). The license should then be a link to the license text. -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Preview of the dialog: https://cloud.snyman.info/index.php/apps/gallery/s/RETCYmSQZ7pA2ct -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/update-about into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/update-about into
lp:openlp.
Commit message:
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/update-about into lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2019-08-18 09:15:51 +
+++ openlp/core/ui/aboutdialog.py 2019-08-23 03:23:33 +
@@ -41,21 +41,33 @@
"""
about_dialog.setObjectName('about_dialog')
about_dialog.setWindowIcon(UiIcons().main_icon)
-self.about_dialog_layout = QtWidgets.QVBoxLayout(about_dialog)
-self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
-self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout = QtWidgets.QVBoxLayout(about_dialog)
+self.base_layout.setContentsMargins(0, 0, 0, 0)
+self.base_layout.setSpacing(0)
+self.base_layout.setObjectName('base_layout')
self.logo_label = QtWidgets.QLabel(about_dialog)
self.logo_label.setPixmap(QtGui.QPixmap(':/graphics/openlp-about-logo.png'))
+self.logo_label.setStyleSheet('background-color: #fff')
+self.logo_label.setMargin(8)
self.logo_label.setObjectName('logo_label')
-self.about_dialog_layout.addWidget(self.logo_label)
+self.base_layout.addWidget(self.logo_label)
+self.line = QtWidgets.QFrame(about_dialog)
+self.line.setFrameShape(QtWidgets.QFrame.HLine)
+self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+self.line.setObjectName('line')
+self.base_layout.addWidget(self.line)
+self.about_dialog_layout = QtWidgets.QVBoxLayout()
+self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
+self.about_dialog_layout.setSpacing(8)
+self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout.addLayout(self.about_dialog_layout)
self.about_notebook = QtWidgets.QTabWidget(about_dialog)
self.about_notebook.setObjectName('about_notebook')
self.about_tab = QtWidgets.QWidget()
self.about_tab.setObjectName('about_tab')
self.about_tab_layout = QtWidgets.QVBoxLayout(self.about_tab)
self.about_tab_layout.setObjectName('about_tab_layout')
-self.about_text_edit = QtWidgets.QPlainTextEdit(self.about_tab)
-self.about_text_edit.setReadOnly(True)
+self.about_text_edit = QtWidgets.QTextBrowser(self.about_tab)
self.about_text_edit.setObjectName('about_text_edit')
self.about_tab_layout.addWidget(self.about_text_edit)
self.about_notebook.addTab(self.about_tab, '')
@@ -63,8 +75,7 @@
self.credits_tab.setObjectName('credits_tab')
self.credits_tab_layout = QtWidgets.QVBoxLayout(self.credits_tab)
self.credits_tab_layout.setObjectName('credits_tab_layout')
-self.credits_text_edit = QtWidgets.QPlainTextEdit(self.credits_tab)
-self.credits_text_edit.setReadOnly(True)
+self.credits_text_edit = QtWidgets.QTextBrowser(self.credits_tab)
self.credits_text_edit.setObjectName('credits_text_edit')
self.credits_tab_layout.addWidget(self.credits_text_edit)
self.about_notebook.addTab(self.credits_tab, '')
@@ -72,14 +83,13 @@
self.license_tab.setObjectName('license_tab')
self.license_tab_layout = QtWidgets.QVBoxLayout(self.license_tab)
self.license_tab_layout.setObjectName('license_tab_layout')
-self.license_text_edit = QtWidgets.QPlainTextEdit(self.license_tab)
-self.license_text_edit.setReadOnly(True)
+self.license_text_edit = QtWidgets.QTextBrowser(self.license_tab)
self.license_text_edit.setObjectName('license_text_edit')
self.license_tab_layout.addWidget(self.license_text_edit)
self.about_notebook.addTab(self.license_tab, '')
self.about_dialog_layout.addWidget(self.about_notebook)
-self.volunteer_button = create_button(None, 'volunteer_button', icon=UiIcons().volunteer)
-self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.volunteer_button])
+self.contribute_button = create_button(None, 'contribute_button', icon=UiIcons().volunteer)
+self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.contribute_button])
self.about_dialog_layout.addWidget(self.button_box)
self.retranslate_ui(about_dialog)
