Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00
Code Releases Activity

Ctrl + click on back/forward buttons now goes back in new tab.

Browse Source 
- available languages are now in first page in preferences
- updated Portuguese translation
This commit is contained in:
nowrep 2012-02-08 14:40:21 +01:00
parent 2387e390dd
commit 54c0ea65f8
6 changed files with 105 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/locale/pt_PT.qm
View File

Binary file not shown.

1
src/app/qupzilla.h
View File

@ -110,7 +110,6 @@ public:
inline QMenu* menuHelp() { return m_menuHelp; }
inline QAction* actionRestoreTab() { return m_actionRestoreTab; }
inline QAction* actionReload() { return m_actionReload; }
inline QAction* actionStop() { return m_actionStop; }
inline QMenu* superMenu() { return m_superMenu; }
inline bool isClosing() { return m_isClosing; }

2
src/navigation/navigationbar.cpp
View File

@ -134,8 +134,10 @@ NavigationBar::NavigationBar(QupZilla* mainClass, QWidget* parent)
connect(m_menuForward, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryNextMenu()));
connect(m_buttonBack, SIGNAL(clicked()), this, SLOT(goBack()));
connect(m_buttonBack, SIGNAL(middleMouseClicked()), this, SLOT(goBackInNewTab()));
connect(m_buttonBack, SIGNAL(controlClicked()), this, SLOT(goBackInNewTab()));
connect(m_buttonNext, SIGNAL(clicked()), this, SLOT(goForward()));
connect(m_buttonNext, SIGNAL(middleMouseClicked()), this, SLOT(goForwardInNewTab()));
connect(m_buttonNext, SIGNAL(controlClicked()), this, SLOT(goForwardInNewTab()));
connect(m_reloadStop->buttonStop(), SIGNAL(clicked()), p_QupZilla, SLOT(stop()));
connect(m_reloadStop->buttonReload(), SIGNAL(clicked()), p_QupZilla, SLOT(reload()));

206
src/preferences/preferences.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>754</width>
<height>500</height>
<width>829</width>
<height>484</height>
</rect>
</property>
<property name="windowTitle">
@ -292,24 +292,24 @@
</item>
</widget>
</item>
<item row="7" column="0" colspan="2">
<item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>&lt;b&gt;Profiles&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="8" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Startup profile:</string>
</property>
</widget>
</item>
<item row="9" column="2">
<item row="8" column="2">
<widget class="QComboBox" name="startProfile"/>
</item>
<item row="10" column="2" colspan="2">
<item row="9" column="1" colspan="3">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
@ -331,17 +331,14 @@
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QLabel" name="cannotDeleteActiveProfileLabel">
<property name="text">
<string>Note: You cannot delete active profile.</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</spacer>
</widget>
</item>
<item>
<widget class="QPushButton" name="createProfile">
@ -375,7 +372,7 @@
</layout>
</widget>
</item>
<item row="12" column="1">
<item row="16" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -410,29 +407,6 @@
</layout>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="11" column="1" colspan="2">
<widget class="QLabel" name="cannotDeleteActiveProfileLabel">
<property name="text">
<string>Note: You cannot delete active profile.</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="QCheckBox" name="checkUpdates">
<property name="text">
@ -440,20 +414,60 @@
</property>
</widget>
</item>
<item row="8" column="1">
<item row="7" column="1">
<widget class="QLabel" name="label_45">
<property name="text">
<string>Active profile:</string>
</property>
</widget>
</item>
<item row="8" column="2">
<item row="7" column="2">
<widget class="QLabel" name="activeProfile">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="15" column="1" colspan="2">
<widget class="QLabel" name="label_17">
<property name="text">
<string>In order to change language, you must restart browser.</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="3">
<widget class="QLabel" name="label_11">
<property name="text">
<string>&lt;b&gt;Language&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="12" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<widget class="QLabel" name="label_16">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Available translations: </string>
</property>
</widget>
</item>
</layout>
</item>
<item row="12" column="2">
<widget class="QComboBox" name="languages"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="stackedWidgetPage2">
@ -2014,77 +2028,24 @@
</widget>
<widget class="QWidget" name="stackedWidgetPage7">
<layout class="QGridLayout" name="gridLayout_13">
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="label_11">
<property name="text">
<string>&lt;b&gt;Language&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Available translations: </string>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="languages"/>
</item>
<item row="2" column="3">
<spacer name="horizontalSpacer_6">
<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 row="3" column="1" colspan="2">
<widget class="QLabel" name="label_17">
<property name="text">
<string>In order to change language, you must restart browser.</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="4">
<item row="7" column="0" colspan="4">
<widget class="QLabel" name="label_9">
<property name="text">
<string>&lt;b&gt;Other&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="4">
<item row="8" column="0" colspan="4">
<widget class="QLabel" name="label_15">
<property name="text">
<string>StyleSheet automatically loaded with all websites: </string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="9" column="1">
<widget class="QLineEdit" name="userStyleSheet"/>
</item>
<item row="10" column="2">
<item row="9" column="2">
<widget class="QToolButton" name="chooseUserStylesheet">
<property name="text">
<string>...</string>
@ -2122,27 +2083,14 @@
</property>
</widget>
</item>
<item row="7" column="0">
<spacer name="verticalSpacer_13">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="11" column="0" colspan="2">
<item row="10" column="0" colspan="2">
<widget class="QCheckBox" name="changeUserAgent">
<property name="text">
<string>Change browser identification:</string>
</property>
</widget>
</item>
<item row="12" column="1" colspan="2">
<item row="11" column="1" colspan="2">
<widget class="QComboBox" name="userAgentCombo">
<property name="maximumSize">
<size>
@ -2155,7 +2103,7 @@
</property>
</widget>
</item>
<item row="13" column="0">
<item row="12" column="0">
<spacer name="verticalSpacer_15">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -2168,6 +2116,35 @@
</property>
</spacer>
</item>
<item row="5" column="0">
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="3">
<spacer name="horizontalSpacer_6">
<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>
</widget>
@ -2219,7 +2196,6 @@
<tabstop>useNativeSystemNotifications</tabstop>
<tabstop>doNotUseNotifications</tabstop>
<tabstop>notificationTimeout</tabstop>
<tabstop>languages</tabstop>
<tabstop>preferredLanguages</tabstop>
<tabstop>userStyleSheet</tabstop>
<tabstop>chooseUserStylesheet</tabstop>

2
src/webview/searchtoolbar.cpp
View File

@ -50,7 +50,6 @@ SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget* parent)
QShortcut* findPreviousAction = new QShortcut(QKeySequence("Shift+F3"), this);
connect(findPreviousAction, SIGNAL(activated()), this, SLOT(findPrevious()));
p_QupZilla->actionStop()->setEnabled(false);
qApp->installEventFilter(this);
}
@ -155,6 +154,5 @@ bool SearchToolBar::eventFilter(QObject* obj, QEvent* event)
SearchToolBar::~SearchToolBar()
{
p_QupZilla->actionStop()->setEnabled(true);
delete ui;
}

24
translations/pt_PT.ts
View File

@ -291,7 +291,7 @@
<message>
<location filename="../src/preferences/autofillmanager.ui" line="104"/>
<source>Import/Export</source>
<translation type="unfinished"></translation>
<translation>Importar/Exportar</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.ui" line="131"/>
@ -308,12 +308,12 @@
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="38"/>
<source>Import Passwords from File...</source>
<translation type="unfinished"></translation>
<translation>Importar senhas do ficheiro...</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="39"/>
<source>Export Passwords to File...</source>
<translation type="unfinished"></translation>
<translation>Exportar senhas para o ficheiro...</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="90"/>
@ -349,32 +349,32 @@
<location filename="../src/preferences/autofillmanager.cpp" line="195"/>
<location filename="../src/preferences/autofillmanager.cpp" line="215"/>
<source>Choose file...</source>
<translation type="unfinished">Escolha o ficheiro...</translation>
<translation>Escolha o ficheiro...</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="202"/>
<source>Cannot read file!</source>
<translation type="unfinished"></translation>
<translation>Incapaz de ler o ficheiro!</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="229"/>
<source>Successfully exported</source>
<translation type="unfinished"></translation>
<translation>Exportado com sucesso</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="209"/>
<source>Error while importing!</source>
<translation type="unfinished"></translation>
<translation>Ocorreu um erro ao importar!</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="209"/>
<source>Successfully imported</source>
<translation type="unfinished"></translation>
<translation>Importado com sucesso</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="222"/>
<source>Cannot write to file!</source>
<translation type="unfinished">Incapaz de escrever no ficheiro!</translation>
<translation>Incapaz de escrever no ficheiro!</translation>
</message>
</context>
<context>
@ -925,7 +925,7 @@
<location filename="../src/bookmarks/bookmarkswidget.cpp" line="49"/>
<location filename="../src/bookmarks/bookmarkswidget.cpp" line="118"/>
<source>Add to Speed Dial</source>
<translation type="unfinished"></translation>
<translation>Adicionar à ligação rápida</translation>
</message>
</context>
<context>
@ -2430,7 +2430,7 @@ não foi encontrado!</translation>
<message>
<location filename="../src/preferences/preferences.ui" line="2141"/>
<source>Change browser identification:</source>
<translation type="unfinished"></translation>
<translation>Alterar identificação do navegador:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="695"/>
@ -3772,7 +3772,7 @@ não foi encontrado!</translation>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="268"/>
<source>Placement: </source>
<translation>Posicionamnto: </translation>
<translation>Posicionamento: </translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="269"/>