Skip to content

Commit

Permalink
Merge pull request #130 from shundhammer/huha-menu-01
Browse files Browse the repository at this point in the history
New Widget: MenuBar (Qt UI Implementation)
  • Loading branch information
shundhammer committed Aug 12, 2020
2 parents cf7abc3 + 81ce41d commit 6ddf269
Show file tree
Hide file tree
Showing 112 changed files with 581 additions and 149 deletions.
2 changes: 2 additions & 0 deletions SOURCECONF.cmake
Expand Up @@ -38,6 +38,7 @@ SET( ${TARGETLIB}_SOURCES
YQLayoutBox.cc
YQLogView.cc
YQMainWinDock.cc
YQMenuBar.cc
YQMenuButton.cc
YQMultiLineEdit.cc
YQMultiProgressMeter.cc
Expand Down Expand Up @@ -107,6 +108,7 @@ SET( ${TARGETLIB}_HEADERS
YQLayoutBox.h
YQLogView.h
YQMainWinDock.h
YQMenuBar.h
YQMenuButton.h
YQMultiLineEdit.h
YQMultiProgressMeter.h
Expand Down
4 changes: 2 additions & 2 deletions VERSION.cmake
@@ -1,11 +1,11 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "53")
SET(VERSION_MINOR "54")
SET(VERSION_PATCH "0")
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )

##### This is needed for the libyui-qt core ONLY.
##### These will be overridden from exports in LibyuiConfig.cmake
SET( SONAME_MAJOR "12" )
SET( SONAME_MAJOR "13" )
SET( SONAME_MINOR "0" )
SET( SONAME_PATCH "0" )
SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" )
4 changes: 2 additions & 2 deletions package/libyui-qt-doc.spec
Expand Up @@ -17,11 +17,11 @@


%define parent libyui-qt
%define so_version 12
%define so_version 13

Name: %{parent}-doc
# DO NOT manually bump the version here; instead, use rake version:bump
Version: 2.53.0
Version: 2.54.0
Release: 0
Source: %{parent}-%{version}.tar.bz2

Expand Down
7 changes: 7 additions & 0 deletions package/libyui-qt.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 11 13:52:19 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>

- Added MenuBar widget (bsc#1175115)
- Bumped SO version to 13
- 2.54.0

-------------------------------------------------------------------
Thu Jun 4 11:58:01 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>

Expand Down
4 changes: 2 additions & 2 deletions package/libyui-qt.spec
Expand Up @@ -18,11 +18,11 @@

Name: libyui-qt
# DO NOT manually bump the version here; instead, use rake version:bump
Version: 2.53.0
Version: 2.54.0
Release: 0
Source: %{name}-%{version}.tar.bz2

%define so_version 12
%define so_version 13
%define bin_name %{name}%{so_version}

BuildRequires: boost-devel
Expand Down
2 changes: 1 addition & 1 deletion src/QY2CharValidator.cc
Expand Up @@ -18,7 +18,7 @@
File: QY2CharValidator.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt object - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/QY2CharValidator.h
Expand Up @@ -18,7 +18,7 @@
File: QY2CharValidator.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt object - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/QY2ComboTabWidget.cc
Expand Up @@ -18,7 +18,7 @@
File: QY2ComboTabWidget.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt widget - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/QY2ComboTabWidget.h
Expand Up @@ -18,7 +18,7 @@
File: QY2ComboTabWidget.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt widget - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/QY2DiskUsageList.cc
Expand Up @@ -18,7 +18,7 @@
File: QY2DiskUsageList.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
Textdomain "qt"
Expand Down
2 changes: 1 addition & 1 deletion src/QY2DiskUsageList.h
Expand Up @@ -18,7 +18,7 @@
File: QY2DiskUsageList.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt widget - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/QY2ListView.cc
Expand Up @@ -18,7 +18,7 @@
File: QY2ListView.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt widget - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/QY2ListView.h
Expand Up @@ -18,7 +18,7 @@
File: QY2ListView.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
This is a pure Qt widget - it can be used independently of YaST2.
Expand Down
2 changes: 1 addition & 1 deletion src/YQAlignment.cc
Expand Up @@ -18,7 +18,7 @@
File: YQAlignment.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQAlignment.h
Expand Up @@ -18,7 +18,7 @@
File: YQAlignment.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQApplication.cc
Expand Up @@ -18,7 +18,7 @@
File: YQApplication.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
Textdomain "qt"
/-*/
Expand Down
2 changes: 1 addition & 1 deletion src/YQApplication.h
Expand Up @@ -18,7 +18,7 @@
File: YQApplication.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQBarGraph.cc
Expand Up @@ -18,7 +18,7 @@
File: YQBarGraph.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQBarGraph.h
Expand Up @@ -18,7 +18,7 @@
File: YQBarGraph.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQButtonBox.cc
Expand Up @@ -18,7 +18,7 @@
File: YQButtonBox.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQButtonBox.h
Expand Up @@ -18,7 +18,7 @@
File: YQButtonBox.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQCheckBox.cc
Expand Up @@ -18,7 +18,7 @@
File: YQCheckBox.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQCheckBox.h
Expand Up @@ -18,7 +18,7 @@
File: YQCheckBox.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQCheckBoxFrame.cc
Expand Up @@ -18,7 +18,7 @@
File: YQCheckBoxFrame.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQCheckBoxFrame.h
Expand Up @@ -18,7 +18,7 @@
File: YQCheckBoxFrame.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQComboBox.cc
Expand Up @@ -18,7 +18,7 @@
File: YQComboBox.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQComboBox.h
Expand Up @@ -18,7 +18,7 @@
File: YQComboBox.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQContextMenu.cc
Expand Up @@ -169,7 +169,7 @@ YQContextMenu::menuEntryActivated( QAction* action )
*/

/*
* the 100 delay is a ugly dirty workaround
* The 100 delay is an ugly dirty workaround.
*/
_suppressCancelEvent = true;
QTimer::singleShot( 100, this, SLOT( returnNow() ) );
Expand Down
2 changes: 1 addition & 1 deletion src/YQDateField.cc
Expand Up @@ -18,7 +18,7 @@
File: YQDateField.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQDateField.h
Expand Up @@ -18,7 +18,7 @@
File: YQDateField.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQDialog.cc
Expand Up @@ -18,7 +18,7 @@
File: YQDialog.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
Textdomain "qt"
Expand Down
2 changes: 1 addition & 1 deletion src/YQDialog.h
Expand Up @@ -18,7 +18,7 @@
File: YQDialog.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQDownloadProgress.cc
Expand Up @@ -18,7 +18,7 @@
File: YQLogView.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQDownloadProgress.h
Expand Up @@ -18,7 +18,7 @@
File: YQDownloadProgress.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQDumbTab.cc
Expand Up @@ -18,7 +18,7 @@
File: YQDumbTab.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQDumbTab.h
Expand Up @@ -18,7 +18,7 @@
File: YQDumbTab.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQEmpty.cc
Expand Up @@ -18,7 +18,7 @@
File: YQEmpty.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQEmpty.h
Expand Up @@ -18,7 +18,7 @@
File: YQEmpty.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQFrame.cc
Expand Up @@ -18,7 +18,7 @@
File: YQFrame.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQFrame.h
Expand Up @@ -18,7 +18,7 @@
File: YQFrame.h
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down
2 changes: 1 addition & 1 deletion src/YQGenericButton.cc
Expand Up @@ -18,7 +18,7 @@
File: YQGenericButton.cc
Author: Stefan Hundhammer <sh@suse.de>
Author: Stefan Hundhammer <shundhammer@suse.de>
/-*/

Expand Down

0 comments on commit 6ddf269

Please sign in to comment.