Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redesign the Layout viewer dialog #145

Merged
merged 1 commit into from
May 2, 2020
Merged

Redesign the Layout viewer dialog #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions src/frontend/LayoutViewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include <QCloseEvent>
#include <zstd.h>
#include "LayoutViewer.h"
#include "Settings.h"
Expand All @@ -41,16 +42,26 @@ LayoutViewer::~LayoutViewer() {
void LayoutViewer::refreshLayoutViewer() {
image0.clear();
image1.clear();
ui->viewAltGr->setEnabled(false);
ui->viewNormal->setEnabled(false);
ui->labelImage->setText("");

desc = gLayout->getDesc();
this->setWindowTitle(desc.name + " :: Layout Viewer");

image0 = decodeAndDecompress(desc.image0);
if(desc.image1.size() != 0) {
image1 = decodeAndDecompress(desc.image1);
if(desc.image0.size() != 0) {
image0 = decodeAndDecompress(desc.image0);
if(desc.image1.size() != 0) {
image1 = decodeAndDecompress(desc.image1);
ui->viewAltGr->setEnabled(true);
}
ui->viewNormal->setEnabled(true);
on_viewNormal_clicked();
} else {
ui->labelImage->setText("No image to display!");
this->resize(537, 152);
}

on_viewNormal_clicked();
// This refreshes Layout Info Dialog
aboutDialog->setDialogType(AboutLayout);
}
Expand All @@ -60,36 +71,35 @@ void LayoutViewer::showLayoutInfoDialog() {
aboutDialog->show();
}

void LayoutViewer::on_buttonClose_clicked() {
void LayoutViewer::closeEvent(QCloseEvent *event) {
gSettings->setLayoutViewerWindowPosition(this->pos());
LayoutViewer::close();
event->accept();
}

void LayoutViewer::on_buttonAboutLayout_clicked() {
showLayoutInfoDialog();
}

void LayoutViewer::on_viewNormal_clicked() {
ui->labelImage->setText("");
image.loadFromData(image0);
ui->labelImage->setPixmap(QPixmap::fromImage(image));
ui->labelImage->adjustSize();
this->setFixedHeight(ui->labelImage->height() + ui->labelImage->y());
this->setFixedWidth(ui->labelImage->width());
QSize size;
size.setHeight(ui->labelImage->height() + ui->labelImage->y());
size.setWidth(ui->labelImage->width());
this->resize(size);
ui->viewNormal->setChecked(true);
}

void LayoutViewer::on_viewAltGr_clicked() {
if (image1.size() != 0) {
image.loadFromData(image1);
ui->labelImage->setPixmap(QPixmap::fromImage(image));
ui->labelImage->adjustSize();
this->setFixedHeight(ui->labelImage->height() + ui->labelImage->y());
this->setFixedWidth(ui->labelImage->width());
ui->viewAltGr->setChecked(true);
} else {
ui->labelImage->setText("No image to display!");
}
image.loadFromData(image1);
ui->labelImage->setPixmap(QPixmap::fromImage(image));
ui->labelImage->adjustSize();
QSize size;
size.setHeight(ui->labelImage->height() + ui->labelImage->y());
size.setWidth(ui->labelImage->width());
this->resize(size);
ui->viewAltGr->setChecked(true);
}

QByteArray LayoutViewer::decodeAndDecompress(QByteArray &data) {
Expand Down
5 changes: 3 additions & 2 deletions src/frontend/LayoutViewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ Q_OBJECT

void showLayoutInfoDialog();

private slots:
protected:
void closeEvent(QCloseEvent *event) override;

void on_buttonClose_clicked();
private slots:

void on_buttonAboutLayout_clicked();

Expand Down
224 changes: 120 additions & 104 deletions src/frontend/LayoutViewer.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,83 +6,132 @@
<rect>
<x>0</x>
<y>0</y>
<width>779</width>
<height>417</height>
<width>914</width>
<height>192</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="horizontalSpacing">
<number>13</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="0" column="3">
<widget class="QPushButton" name="buttonZoomOut">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/zoom-out.png</normaloff>:/images/zoom-out.png</iconset>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="viewAltGr">
<property name="text">
<string>AltGr View</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/keyboard_layout.png</normaloff>:/images/keyboard_layout.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QPushButton" name="buttonAboutLayout">
<property name="text">
<string>About Layout</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QPushButton" name="buttonClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="buttomZoomIn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/zoom-in.png</normaloff>:/images/zoom-in.png</iconset>
</property>
</widget>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="viewNormal">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Normal View</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/keyboard_layout.png</normaloff>:/images/keyboard_layout.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="viewAltGr">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>AltGr View</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/keyboard_layout.png</normaloff>:/images/keyboard_layout.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonAboutLayout">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>About this Layout</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/about.png</normaloff>:/images/about.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" colspan="7">
<item>
<widget class="QLabel" name="labelImage">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
Expand All @@ -95,39 +144,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="viewNormal">
<property name="text">
<string>Normal View</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/keyboard_layout.png</normaloff>:/images/keyboard_layout.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>
Expand Down