Skip to content

Commit

Permalink
UI layout changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Stepan Kuzmin committed Aug 6, 2011
1 parent 06abc76 commit c624f1b
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 128 deletions.
23 changes: 20 additions & 3 deletions zenwriter.cpp
View file
Expand Up @@ -5,8 +5,9 @@ ZenWriter::ZenWriter(QWidget *parent) :
QWidget(parent),
ui(new Ui::ZenWriter)
{
this->isFullScreen = false;
ui->setupUi(this);
this->isWriteMode = false;
this->isFullScreen = false;
}

ZenWriter::~ZenWriter()
Expand Down Expand Up @@ -64,7 +65,7 @@ void ZenWriter::on_openButton_clicked()
}
}

void ZenWriter::on_fontSizeLess_clicked()
void ZenWriter::on_fontSizeLessButton_clicked()
{
QFont font = ui->plainTextEdit->font();
if (font.pointSize() > 8) {
Expand All @@ -73,11 +74,27 @@ void ZenWriter::on_fontSizeLess_clicked()
}
}

void ZenWriter::on_fontSizeMore_clicked()
void ZenWriter::on_fontSizeMoreButton_clicked()
{
QFont font = ui->plainTextEdit->font();
if (font.pointSize() < 72) {
font.setPointSize(font.pointSize() + 2);
ui->plainTextEdit->setFont(font);
}
}

void ZenWriter::on_plainTextEdit_textChanged()
{
if (!this->isWriteMode) {
ui->frame->setVisible(false);
this->isWriteMode = true;
}
}

void ZenWriter::mouseMoveEvent(QMouseEvent *event)
{
if (this->isWriteMode) {
ui->frame->setVisible(true);
this->isWriteMode = false;
}
}
9 changes: 7 additions & 2 deletions zenwriter.h
View file
Expand Up @@ -28,12 +28,17 @@ private slots:

void on_switchFullScreenButton_clicked();

void on_fontSizeLess_clicked();
void on_plainTextEdit_textChanged();

void on_fontSizeMore_clicked();
void on_fontSizeLessButton_clicked();

void on_fontSizeMoreButton_clicked();

void mouseMoveEvent(QMouseEvent *event);

private:
QFile file;
bool isWriteMode;
bool isFullScreen;
Ui::ZenWriter *ui;
};
Expand Down
251 changes: 128 additions & 123 deletions zenwriter.ui
View file
Expand Up @@ -6,10 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>726</width>
<height>440</height>
<width>324</width>
<height>328</height>
</rect>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="windowTitle">
<string>ZenWriter</string>
</property>
Expand All @@ -24,127 +27,129 @@
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QPushButton" name="newButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/new.svg</normaloff>:/icons/new.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="saveButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/save.svg</normaloff>:/icons/save.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="openButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/open.svg</normaloff>:/icons/open.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="fontSizeMore">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/font-size-more.png</normaloff>:/icons/font-size-more.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="switchFullScreenButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/fullscreen.svg</normaloff>:/icons/fullscreen.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="fontSizeLess">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/font-size-less.png</normaloff>:/icons/font-size-less.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
<widget class="QWidget" name="frame" native="true">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QVBoxLayout" name="actionsLayout">
<item>
<widget class="QPushButton" name="newButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/new.svg</normaloff>:/icons/new.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="saveButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/save.svg</normaloff>:/icons/save.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="openButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/open.svg</normaloff>:/icons/open.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="fontSizeMoreButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/font-size-more.png</normaloff>:/icons/font-size-more.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="fontSizeLessButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/font-size-less.png</normaloff>:/icons/font-size-less.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="switchFullScreenButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="zenwriter.qrc">
<normaloff>:/icons/fullscreen.svg</normaloff>:/icons/fullscreen.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>32</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
Expand Down

0 comments on commit c624f1b

Please sign in to comment.