diff options
| -rw-r--r-- | TODO | 10 | ||||
| -rw-r--r-- | src/settings.cpp | 2 | ||||
| -rw-r--r-- | src/settings.ui | 517 |
3 files changed, 10 insertions, 519 deletions
@@ -4,6 +4,13 @@ Road to 0.0.1 (first release) + bookmarks (share konqueror's) + some porting +ROAD to 0.0.2 (second release) ++ setting rekonq with KConfigDialog ("rekonfig") +- configure shortcuts +- better find toolbar +- fixed search bar width + ++ -------------------------------- 0.0.2 + QUrl --> KUrl + KDEize menubar (settings) @@ -18,6 +25,7 @@ NEXT.. - kMainWindow save/read settings - color progress - contextMenu in searchbar to set different search engines +- KDE proxy support - QWebPluginFactory subclass to load KParts into QtWebKit. @@ -28,6 +36,6 @@ NEXT.. - Kpart ?? -+------------------------ ++ ------------------------ diff --git a/src/settings.cpp b/src/settings.cpp index f8fd818f..f765e18c 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -103,7 +103,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply); showButtonSeparator(true); - setWindowTitle( i18n("Setting rekonq..") ); + setWindowTitle( i18n("rekonfig..") ); setModal(true); connect(this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); diff --git a/src/settings.ui b/src/settings.ui deleted file mode 100644 index 31945906..00000000 --- a/src/settings.ui +++ /dev/null @@ -1,517 +0,0 @@ -<ui version="4.0" > - <class>Settings</class> - <widget class="QWidget" name="Settings" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>570</width> - <height>248</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4" > - <item> - <widget class="QTabWidget" name="tabWidget" > - <property name="currentIndex" > - <number>0</number> - </property> - <widget class="QWidget" name="tab" > - <attribute name="title" > - <string>General</string> - </attribute> - <layout class="QGridLayout" name="gridLayout_4" > - <item row="0" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > - <string>Home:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="2" colspan="2" > - <widget class="KLineEdit" name="homeLineEdit" /> - </item> - <item row="1" column="2" > - <widget class="QPushButton" name="setHomeToCurrentPageButton" > - <property name="text" > - <string>Set to current page</string> - </property> - </widget> - </item> - <item row="1" column="3" > - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>280</width> - <height>18</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > - <string>Remove history items:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="2" column="2" colspan="2" > - <widget class="QComboBox" name="expireHistory" > - <item> - <property name="text" > - <string>After one day</string> - </property> - </item> - <item> - <property name="text" > - <string>After one week</string> - </property> - </item> - <item> - <property name="text" > - <string>After two weeks</string> - </property> - </item> - <item> - <property name="text" > - <string>After one month</string> - </property> - </item> - <item> - <property name="text" > - <string>After one year</string> - </property> - </item> - <item> - <property name="text" > - <string>Manually</string> - </property> - </item> - </widget> - </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_7" > - <property name="text" > - <string>Save downloads to:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_8" > - <property name="text" > - <string>Open links from applications:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="4" column="2" colspan="2" > - <widget class="QComboBox" name="openLinksIn" > - <item> - <property name="text" > - <string>In a tab in the current window</string> - </property> - </item> - <item> - <property name="text" > - <string>In a new window</string> - </property> - </item> - </widget> - </item> - <item row="5" column="2" colspan="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>391</width> - <height>262</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="2" colspan="2" > - <widget class="KUrlRequester" name="kurlrequester" /> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_3" > - <attribute name="title" > - <string>Appearance</string> - </attribute> - <layout class="QGridLayout" name="gridLayout_3" > - <item row="0" column="0" > - <widget class="QLabel" name="label_5" > - <property name="text" > - <string>Standard font:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QLabel" name="standardLabel" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape" > - <enum>QFrame::StyledPanel</enum> - </property> - <property name="text" > - <string>Times 16</string> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="0" column="2" > - <widget class="QPushButton" name="standardFontButton" > - <property name="text" > - <string>Select...</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_6" > - <property name="text" > - <string>Fixed-width font:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QLabel" name="fixedLabel" > - <property name="frameShape" > - <enum>QFrame::StyledPanel</enum> - </property> - <property name="text" > - <string>Courier 13</string> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="1" column="2" > - <widget class="QPushButton" name="fixedFontButton" > - <property name="text" > - <string>Select...</string> - </property> - </widget> - </item> - <item row="2" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>93</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > - <string>Privacy</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Web Content</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > - <item> - <widget class="QCheckBox" name="enablePlugins" > - <property name="text" > - <string>Enable Plugins</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="enableJavascript" > - <property name="text" > - <string>Enable Javascript</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="cookiesGroupBox" > - <property name="title" > - <string>Cookies</string> - </property> - <layout class="QGridLayout" name="_2" > - <item row="0" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > - <string>Accept Cookies:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QComboBox" name="acceptCombo" > - <item> - <property name="text" > - <string>Always</string> - </property> - </item> - <item> - <property name="text" > - <string>Never</string> - </property> - </item> - <item> - <property name="text" > - <string>Only from sites you navigate to</string> - </property> - </item> - </widget> - </item> - <item row="0" column="2" > - <widget class="QPushButton" name="exceptionsButton" > - <property name="text" > - <string>Exceptions...</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string>Keep until:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QComboBox" name="keepUntilCombo" > - <item> - <property name="text" > - <string>They expire</string> - </property> - </item> - <item> - <property name="text" > - <string>I exit the application</string> - </property> - </item> - <item> - <property name="text" > - <string>At most 90 days</string> - </property> - </item> - </widget> - </item> - <item row="1" column="2" > - <widget class="QPushButton" name="cookiesButton" > - <property name="text" > - <string>Cookies...</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>371</width> - <height>177</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_4" > - <attribute name="title" > - <string>Proxy</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QGroupBox" name="proxySupport" > - <property name="title" > - <string>Enable proxy</string> - </property> - <property name="checkable" > - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout_6" > - <item row="0" column="0" > - <widget class="QLabel" name="label_9" > - <property name="text" > - <string>Type:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="1" colspan="2" > - <widget class="QComboBox" name="proxyType" > - <item> - <property name="text" > - <string>Socks5</string> - </property> - </item> - <item> - <property name="text" > - <string>Http</string> - </property> - </item> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_10" > - <property name="text" > - <string>Host:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2" > - <widget class="KLineEdit" name="proxyHostName" /> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_11" > - <property name="text" > - <string>Port:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="2" column="1" > - <widget class="QSpinBox" name="proxyPort" > - <property name="maximum" > - <number>10000</number> - </property> - <property name="value" > - <number>1080</number> - </property> - </widget> - </item> - <item row="2" column="2" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>293</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_12" > - <property name="text" > - <string>User Name:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="3" column="1" colspan="2" > - <widget class="KLineEdit" name="proxyUserName" /> - </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_13" > - <property name="text" > - <string>Password:</string> - </property> - <property name="alignment" > - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="4" column="1" colspan="2" > - <widget class="KLineEdit" name="proxyPassword" /> - </item> - <item row="5" column="0" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>20</width> - <height>8</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> - <customwidget> - <class>KUrlRequester</class> - <extends>QFrame</extends> - <header>kurlrequester.h</header> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> |