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

LocationBar: Drop "Add .co.uk when pressing ALT" feature

Browse Source 
It doesn't work when completer popup is displayed and also it was
weird feature that could confuse users (Why was .co.uk added to the
text when I pressed ALT?).
This commit is contained in:
David Rosca 2015-11-06 17:44:33 +01:00
parent aa0ec8cbc0
commit d1a15906b5
6 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/navigation/locationbar.cpp
View File

@ -523,19 +523,6 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
LineEdit::keyPressEvent(event);
}
void LocationBar::keyReleaseEvent(QKeyEvent* event)
{
QString localDomain = tr(".co.uk", "Append domain name on ALT + Enter = Should be different for every country");
if (event->key() == Qt::Key_Alt && m_holdingAlt && qzSettings->addCountryWithAlt &&
!text().endsWith(localDomain) && !text().endsWith(QLatin1Char('/'))
) {
LineEdit::setText(text().append(localDomain));
}
LineEdit::keyReleaseEvent(event);
}
void LocationBar::loadStarted()
{
m_progressVisible = true;

1
src/lib/navigation/locationbar.h
View File

@ -83,7 +83,6 @@ private:
void focusInEvent(QFocusEvent* event);
void focusOutEvent(QFocusEvent* event);
void keyPressEvent(QKeyEvent* event);
void keyReleaseEvent(QKeyEvent* event);
void dropEvent(QDropEvent* event);
void paintEvent(QPaintEvent* event);

1
src/lib/other/qzsettings.cpp
View File

@ -30,7 +30,6 @@ void QzSettings::loadSettings()
settings.beginGroup("AddressBar");
selectAllOnDoubleClick = settings.value("SelectAllTextOnDoubleClick", true).toBool();
selectAllOnClick = settings.value("SelectAllTextOnClick", false).toBool();
addCountryWithAlt = settings.value("AddCountryDomainWithAltKey", true).toBool();
showLoadingProgress = settings.value("ShowLoadingProgress", false).toBool();
showLocationSuggestions = settings.value("showSuggestions", 0).toInt();
showSwitchTab = settings.value("showSwitchTab", true).toBool();

1
src/lib/other/qzsettings.h
View File

@ -34,7 +34,6 @@ public:
// AddressBar
bool selectAllOnDoubleClick;
bool selectAllOnClick;
bool addCountryWithAlt;
bool showLoadingProgress;
int showLocationSuggestions;
bool showSwitchTab;

2
src/lib/preferences/preferences.cpp
View File

@ -246,7 +246,6 @@ Preferences::Preferences(BrowserWindow* window)
ui->alwaysShowGoIcon->setChecked(settings.value("alwaysShowGoIcon", false).toBool());
ui->selectAllOnFocus->setChecked(settings.value("SelectAllTextOnDoubleClick", true).toBool());
ui->selectAllOnClick->setChecked(settings.value("SelectAllTextOnClick", false).toBool());
ui->addCountryWithAlt->setChecked(settings.value("AddCountryDomainWithAltKey", true).toBool());
bool showPBinAB = settings.value("ShowLoadingProgress", false).toBool();
ui->showLoadingInAddressBar->setChecked(showPBinAB);
ui->adressProgressSettings->setEnabled(showPBinAB);
@ -943,7 +942,6 @@ void Preferences::saveSettings()
settings.setValue("showSwitchTab", ui->completionShowSwitchTab->isChecked());
settings.setValue("SelectAllTextOnDoubleClick", ui->selectAllOnFocus->isChecked());
settings.setValue("SelectAllTextOnClick", ui->selectAllOnClick->isChecked());
settings.setValue("AddCountryDomainWithAltKey", ui->addCountryWithAlt->isChecked());
settings.setValue("ShowLoadingProgress", ui->showLoadingInAddressBar->isChecked());
settings.setValue("ProgressStyle", ui->progressStyleSelector->currentIndex());
settings.setValue("UseCustomProgressColor", ui->checkBoxCustomProgressColor->isChecked());

15
src/lib/preferences/preferences.ui
View File

@ -140,8 +140,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>596</width>
<height>470</height>
<width>582</width>
<height>489</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
@ -1698,13 +1698,6 @@
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="addCountryWithAlt">
<property name="text">
<string>Add .co.uk domain by pressing ALT key in address bar</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="singleKeyShortcuts">
<property name="toolTip">
<string>Existing shortcuts:&lt;br/&gt;&lt;b&gt;1&lt;/b&gt; - previous tab&lt;br/&gt;&lt;b&gt;2&lt;/b&gt; - next tab&lt;br/&gt;&lt;b&gt;/&lt;/b&gt; - search on page</string>
@ -1714,7 +1707,7 @@
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="closeAppWithCtrlQ">
<property name="toolTip">
<string>If unchecked, prevents accidental exit from the application if the Ctrl-W shortcut was intended.</string>
@ -1724,7 +1717,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="1">
<spacer name="verticalSpacer_13">
<property name="orientation">
<enum>Qt::Vertical</enum>