Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/lintest/fb2edit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKandrashin Denis <mail@lintest.ru>2012-09-19 22:05:27 +0400
committerKandrashin Denis <mail@lintest.ru>2012-09-19 22:05:27 +0400
commitdef2b74da504624aede4bea1d174152d7c7fc394 (patch)
tree5b3fcd4567280fb27ab3e8074bc3bbe0952c1914
parentc453ae474b1b191e540e2c382d4a697c7646dd53 (diff)
Create title action
-rw-r--r--3rdparty/gnome/16x16/format-justify-center.pngbin0 -> 411 bytes
-rw-r--r--3rdparty/gnome/16x16/utilities-terminal.pngbin0 -> 691 bytes
-rw-r--r--3rdparty/gnome/24x24/format-justify-center.pngbin0 -> 513 bytes
-rw-r--r--3rdparty/gnome/24x24/utilities-terminal.pngbin0 -> 1005 bytes
-rw-r--r--3rdparty/gnome/gnome.qrc68
-rw-r--r--source/fb2main.cpp8
-rw-r--r--source/fb2main.hpp1
-rw-r--r--source/fb2text.cpp4
-rw-r--r--source/fb2text.hpp1
-rw-r--r--source/ts/ru.qmbin10295 -> 10683 bytes
-rw-r--r--source/ts/ru.ts65
11 files changed, 63 insertions, 84 deletions
diff --git a/3rdparty/gnome/16x16/format-justify-center.png b/3rdparty/gnome/16x16/format-justify-center.png
new file mode 100644
index 0000000..6fc98d5
--- /dev/null
+++ b/3rdparty/gnome/16x16/format-justify-center.png
Binary files differ
diff --git a/3rdparty/gnome/16x16/utilities-terminal.png b/3rdparty/gnome/16x16/utilities-terminal.png
new file mode 100644
index 0000000..c0e6c0e
--- /dev/null
+++ b/3rdparty/gnome/16x16/utilities-terminal.png
Binary files differ
diff --git a/3rdparty/gnome/24x24/format-justify-center.png b/3rdparty/gnome/24x24/format-justify-center.png
new file mode 100644
index 0000000..cf7b234
--- /dev/null
+++ b/3rdparty/gnome/24x24/format-justify-center.png
Binary files differ
diff --git a/3rdparty/gnome/24x24/utilities-terminal.png b/3rdparty/gnome/24x24/utilities-terminal.png
new file mode 100644
index 0000000..3c02dd2
--- /dev/null
+++ b/3rdparty/gnome/24x24/utilities-terminal.png
Binary files differ
diff --git a/3rdparty/gnome/gnome.qrc b/3rdparty/gnome/gnome.qrc
index 77811d6..ad9e56f 100644
--- a/3rdparty/gnome/gnome.qrc
+++ b/3rdparty/gnome/gnome.qrc
@@ -5,71 +5,11 @@
<file>16x16/document-open.png</file>
<file>16x16/document-properties.png</file>
<file>16x16/document-save.png</file>
- <file>16x16/edit-copy.png</file>
- <file>16x16/edit-cut.png</file>
- <file>16x16/edit-find.png</file>
- <file>16x16/edit-find-replace.png</file>
- <file>16x16/edit-paste.png</file>
- <file>16x16/edit-redo.png</file>
- <file>16x16/edit-undo.png</file>
- <file>16x16/format-text-bold.png</file>
- <file>16x16/format-text-italic.png</file>
- <file>16x16/format-text-strikethrough.png</file>
- <file>16x16/go-down.png</file>
- <file>16x16/go-next.png</file>
- <file>16x16/go-previous.png</file>
- <file>16x16/go-up.png</file>
- <file>16x16/insert-image.png</file>
- <file>16x16/insert-link.png</file>
- <file>16x16/insert-object.png</file>
- <file>16x16/insert-text.png</file>
- <file>16x16/list-add.png</file>
- <file>16x16/list-remove.png</file>
- <file>16x16/preferences-desktop.png</file>
- <file>16x16/window-close.png</file>
- <file>16x16/zoom-in.png</file>
- <file>16x16/zoom-original.png</file>
- <file>16x16/zoom-out.png</file>
- <file>24x24/application-exit.png</file>
- <file>24x24/document-new.png</file>
- <file>24x24/document-open.png</file>
- <file>24x24/document-properties.png</file>
- <file>24x24/document-save.png</file>
- <file>24x24/edit-copy.png</file>
- <file>24x24/edit-cut.png</file>
- <file>24x24/edit-find.png</file>
- <file>24x24/edit-find-replace.png</file>
- <file>24x24/edit-paste.png</file>
- <file>24x24/edit-redo.png</file>
- <file>24x24/edit-undo.png</file>
- <file>24x24/format-text-bold.png</file>
- <file>24x24/format-text-italic.png</file>
- <file>24x24/format-text-strikethrough.png</file>
- <file>24x24/go-down.png</file>
- <file>24x24/go-next.png</file>
- <file>24x24/go-previous.png</file>
- <file>24x24/go-up.png</file>
- <file>24x24/insert-image.png</file>
- <file>24x24/insert-link.png</file>
- <file>24x24/insert-object.png</file>
- <file>24x24/insert-text.png</file>
- <file>24x24/list-add.png</file>
- <file>24x24/list-remove.png</file>
- <file>24x24/preferences-desktop.png</file>
- <file>24x24/window-close.png</file>
- <file>24x24/zoom-in.png</file>
- <file>24x24/zoom-original.png</file>
- <file>24x24/zoom-out.png</file>
- <file>16x16/application-exit.png</file>
- <file>16x16/document-new.png</file>
- <file>16x16/document-open.png</file>
- <file>16x16/document-properties.png</file>
- <file>16x16/document-save.png</file>
<file>16x16/edit-clear.png</file>
<file>16x16/edit-copy.png</file>
<file>16x16/edit-cut.png</file>
- <file>16x16/edit-find.png</file>
<file>16x16/edit-find-replace.png</file>
+ <file>16x16/edit-find.png</file>
<file>16x16/edit-paste.png</file>
<file>16x16/edit-redo.png</file>
<file>16x16/edit-undo.png</file>
@@ -101,8 +41,8 @@
<file>24x24/edit-clear.png</file>
<file>24x24/edit-copy.png</file>
<file>24x24/edit-cut.png</file>
- <file>24x24/edit-find.png</file>
<file>24x24/edit-find-replace.png</file>
+ <file>24x24/edit-find.png</file>
<file>24x24/edit-paste.png</file>
<file>24x24/edit-redo.png</file>
<file>24x24/edit-undo.png</file>
@@ -126,5 +66,9 @@
<file>24x24/zoom-in.png</file>
<file>24x24/zoom-original.png</file>
<file>24x24/zoom-out.png</file>
+ <file>16x16/format-justify-center.png</file>
+ <file>24x24/format-justify-center.png</file>
+ <file>16x16/utilities-terminal.png</file>
+ <file>24x24/utilities-terminal.png</file>
</qresource>
</RCC>
diff --git a/source/fb2main.cpp b/source/fb2main.cpp
index 6c5e300..05406e5 100644
--- a/source/fb2main.cpp
+++ b/source/fb2main.cpp
@@ -429,10 +429,9 @@ void FbMainWindow::createActions()
act->setCheckable(true);
menu->addAction(act);
- actionTextCode = act = new QAction(tr("&Code"), this);
+ actionTextCode = act = new QAction(FbIcon("utilities-terminal"), tr("&Code"), this);
act->setCheckable(true);
menu->addAction(act);
- act->setEnabled(false);
menu->addSeparator();
@@ -442,6 +441,9 @@ void FbMainWindow::createActions()
actionSectionDel = act = new FbTextAction(FbIcon("format-indent-less"), tr("Remove section"), QWebPage::ToggleSubscript, this);
menu->addAction(act);
+ actionTextTitle = act = new FbTextAction(FbIcon("format-justify-center"), tr("Make title"), QWebPage::ToggleSubscript, this);
+ menu->addAction(act);
+
menuView = menu = menuBar()->addMenu(tr("&View"));
tool->addSeparator();
@@ -722,6 +724,7 @@ void FbMainWindow::createTextToolbar()
connect(actionSectionAdd, SIGNAL(triggered()), textPage, SLOT(createSection()));
connect(actionSectionDel, SIGNAL(triggered()), textPage, SLOT(deleteSection()));
+ connect(actionTextTitle, SIGNAL(triggered()), textPage, SLOT(createTitle()));
connect(actionZoomIn, SIGNAL(triggered()), textEdit, SLOT(zoomIn()));
connect(actionZoomOut, SIGNAL(triggered()), textEdit, SLOT(zoomOut()));
@@ -737,6 +740,7 @@ void FbMainWindow::createTextToolbar()
tool->addSeparator();
tool->addAction(actionSectionAdd);
tool->addAction(actionSectionDel);
+ tool->addAction(actionTextTitle);
tool->addSeparator();
tool->addAction(actionImage);
diff --git a/source/fb2main.hpp b/source/fb2main.hpp
index b9481d0..450285a 100644
--- a/source/fb2main.hpp
+++ b/source/fb2main.hpp
@@ -149,6 +149,7 @@ private:
*actionTextCode,
*actionTextSub,
*actionTextSup,
+ *actionTextTitle,
*actionSectionAdd,
*actionSectionDel,
*actionContents,
diff --git a/source/fb2text.cpp b/source/fb2text.cpp
index 88e0776..549ed41 100644
--- a/source/fb2text.cpp
+++ b/source/fb2text.cpp
@@ -303,6 +303,10 @@ void FbTextPage::deleteSection()
}
}
+void FbTextPage::createTitle()
+{
+}
+
FbTextElement FbTextPage::current()
{
return element(location());
diff --git a/source/fb2text.hpp b/source/fb2text.hpp
index da35357..b0db251 100644
--- a/source/fb2text.hpp
+++ b/source/fb2text.hpp
@@ -92,6 +92,7 @@ public slots:
void insertDate();
void createSection();
void deleteSection();
+ void createTitle();
protected:
virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
diff --git a/source/ts/ru.qm b/source/ts/ru.qm
index 9c51aaf..d28c437 100644
--- a/source/ts/ru.qm
+++ b/source/ts/ru.qm
Binary files differ
diff --git a/source/ts/ru.ts b/source/ts/ru.ts
index 96c9f86..fa8531b 100644
--- a/source/ts/ru.ts
+++ b/source/ts/ru.ts
@@ -2,25 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0" language="ru_RU">
<context>
- <name>Dialog</name>
- <message>
- <source>Dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Tab 1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Tab 2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>FbAuthorDlg</name>
<message>
<source>Author</source>
@@ -462,7 +443,7 @@
</message>
<message>
<source>Settings</source>
- <translation>Настройки</translation>
+ <translation type="obsolete">Настройки</translation>
</message>
<message>
<source>&amp;Bold</source>
@@ -560,6 +541,23 @@
<source>Paste (no style)</source>
<translation>Вставить простой текст</translation>
</message>
+ <message>
+ <source>Simple text</source>
+ <translation>Простой текст</translation>
+ </message>
+ <message>
+ <source>Create section</source>
+ <translation>Создать секцию</translation>
+ </message>
+ <message>
+ <source>Remove section</source>
+ <translation>Удалить секцию</translation>
+ </message>
+ <message>
+ <source>Make title</source>
+ <translatorcomment>Стиль: Заголовок</translatorcomment>
+ <translation>Заголовок</translation>
+ </message>
</context>
<context>
<name>FbNodeDlg</name>
@@ -622,6 +620,29 @@
</message>
</context>
<context>
+ <name>FbSetup</name>
+ <message>
+ <source>Settings</source>
+ <translation type="unfinished">Настройки</translation>
+ </message>
+ <message>
+ <source>Tab 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Default font:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Style file name:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Tab 2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FbTextEdit</name>
<message>
<source>Common Graphics (*.png *.jpg *.jpeg *.gif);;</source>
@@ -850,5 +871,9 @@
<source>Unknown image format: %1</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Clear format</source>
+ <translation type="unfinished">&amp;Очистить формат</translation>
+ </message>
</context>
</TS>