diff -Nurdb QtWeb-b108/src/QtWeb.pro QtWeb-3.8.5/src/QtWeb.pro --- QtWeb-b108/src/QtWeb.pro 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/QtWeb.pro 2014-03-16 20:34:49.000000000 +0900 @@ -2,7 +2,7 @@ TARGET = QtWeb DESTDIR = ../build QT += network xml webkit -CONFIG += static +#CONFIG += static QTPLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs qico DEFINES += QT_NO_UITOOLS diff -Nurdb QtWeb-b108/src/aboutdialog.ui QtWeb-3.8.5/src/aboutdialog.ui --- QtWeb-b108/src/aboutdialog.ui 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/aboutdialog.ui 2015-01-20 21:47:04.000000000 +0900 @@ -6,7 +6,7 @@ 0 0 - 405 + 394 279 @@ -167,7 +167,9 @@ - + + + closeButton diff -Nurdb QtWeb-b108/src/browserapplication.cpp QtWeb-3.8.5/src/browserapplication.cpp --- QtWeb-b108/src/browserapplication.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/browserapplication.cpp 2015-01-12 10:47:12.000000000 +0900 @@ -218,11 +218,12 @@ void BrowserApplication::definePortableRunMode() { - s_portableRunMode = !QFile::exists(QCoreApplication::applicationDirPath() + "/unins000.exe"); - if (s_portableRunMode) - { +// s_portableRunMode = !QFile::exists(QCoreApplication::applicationDirPath() + "/unins000.exe"); +// if (s_portableRunMode) +// { QSettings::setDefaultFormat(QSettings::IniFormat); - QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::applicationDirPath() + "/QtWebSettings"); +// QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::applicationDirPath() + "/QtWebSettings"); + QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QDir::homePath() + "/.config/qtweb/QtWebSettings"); bool is_writable = true; { QSettings settings; @@ -249,7 +250,7 @@ } } - } +// } } BrowserApplication::~BrowserApplication() @@ -270,7 +271,8 @@ BrowserApplication::resetSettings( false ); removeDir(BrowserApplication::dataLocation()); - removeDir(QCoreApplication::applicationDirPath() + "/QtWebSettings"); +// removeDir(QCoreApplication::applicationDirPath() + "/QtWebSettings"); + removeDir(QDir::homePath() + "/.config/qtweb/QtWebSettings"); #ifdef Q_WS_WIN HKEY hKey; @@ -427,7 +429,7 @@ defaultSettings->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, enable_local_storage); defaultSettings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, enable_local_storage); - QLatin1String localStoragePath = (enable_local_storage ? QLatin1String("QtWebCache") : QLatin1String("")); + QLatin1String localStoragePath = (enable_local_storage ? QLatin1String("/root/.config/qtweb/QtWebCache") : QLatin1String("")); defaultSettings->setLocalStoragePath(localStoragePath); defaultSettings->setOfflineStoragePath(localStoragePath); defaultSettings->setOfflineWebApplicationCachePath(localStoragePath); @@ -934,12 +936,14 @@ { if (s_portableRunMode) { - QDir dir(QCoreApplication::applicationDirPath()); + // QDir dir(QCoreApplication::applicationDirPath()); + QDir dir; + dir = QDir::homePath() + "/.config/qtweb/"; if (!dir.exists("QtWebCache")) if (!dir.mkdir("QtWebCache")) return ""; - return QCoreApplication::applicationDirPath()+ "/QtWebCache"; + return QDir::homePath() + "/.config/qtweb/QtWebCache"; } else return QDesktopServices::storageLocation(QDesktopServices::DataLocation); diff -Nurdb QtWeb-b108/src/browsermainwindow.cpp QtWeb-3.8.5/src/browsermainwindow.cpp --- QtWeb-b108/src/browsermainwindow.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/browsermainwindow.cpp 2015-01-20 21:51:02.000000000 +0900 @@ -1087,7 +1087,7 @@ alignmentGroup->addAction(menuAddEncoding("Korean", "EUC-KR")); // japanese alignmentGroup->addAction(menuAddEncoding("Japanese", "ISO-2022-JP")); - alignmentGroup->addAction(menuAddEncoding("Japanese", "Shift-JIS")); + alignmentGroup->addAction(menuAddEncoding("Japanese", "Shift_JIS")); alignmentGroup->addAction(menuAddEncoding("Japanese", "EUC-JP")); m_encodingMenu->addSeparator(); @@ -1658,9 +1658,9 @@ m_title = title; if (title.isEmpty()) - setWindowTitle(("QtWeb Internet Browser")); + setWindowTitle(("QtWeb-431jp Internet Browser")); else - setWindowTitle(QString("%1 - QtWeb").arg(title)); + setWindowTitle(QString("%1 - QtWeb-431jp").arg(title)); } void BrowserMainWindow::slotEmptyDiskCache() diff -Nurdb QtWeb-b108/src/downloadmanager.cpp QtWeb-3.8.5/src/downloadmanager.cpp --- QtWeb-b108/src/downloadmanager.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/downloadmanager.cpp 2013-09-10 06:10:36.000000000 +0900 @@ -255,10 +255,13 @@ return; QFileInfo info(m_output); + QProcess* process = new QProcess(BrowserApplication::instance()); if ( tryAgainButton->isVisible() || stopButton->isVisible()) - QDesktopServices::openUrl(QUrl::fromLocalFile(info.absolutePath())); +// QDesktopServices::openUrl(QUrl::fromLocalFile(info.absolutePath())); + process->startDetached( QLatin1String("xdg-open"), QStringList() << info.absolutePath()); else - QDesktopServices::openUrl(QUrl::fromLocalFile(info.absoluteFilePath())); +// QDesktopServices::openUrl(QUrl::fromLocalFile(info.absoluteFilePath())); + process->startDetached( QLatin1String("xdg-open"), QStringList() << info.absoluteFilePath()); } void DownloadItem::tryAgain() @@ -724,7 +727,9 @@ void DownloadManager::open_downloads() { - QDesktopServices::openUrl(QUrl::fromLocalFile(dirDownloads(true))); +// QDesktopServices::openUrl(QUrl::fromLocalFile(dirDownloads(true))); +QProcess* process = new QProcess(BrowserApplication::instance()); +process->start( QLatin1String("rox"), QStringList() << dirDownloads( true )); } diff -Nurdb QtWeb-b108/src/exlineedit.cpp QtWeb-3.8.5/src/exlineedit.cpp --- QtWeb-b108/src/exlineedit.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/exlineedit.cpp 2013-09-09 21:12:48.000000000 +0900 @@ -188,7 +188,7 @@ // line edit m_lineEdit->setFrame(false); - m_lineEdit->setFocusProxy(this); +// m_lineEdit->setFocusProxy(this); m_lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false); QPalette clearPalette = m_lineEdit->palette(); clearPalette.setBrush(QPalette::Base, QBrush(Qt::transparent)); diff -Nurdb QtWeb-b108/src/savepdf.cpp QtWeb-3.8.5/src/savepdf.cpp --- QtWeb-b108/src/savepdf.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/savepdf.cpp 2013-10-12 21:54:37.000000000 +0900 @@ -1,9 +1,11 @@ +#include "browserapplication.h" #include "savepdf.h" #include #include #include #include #include +#include extern QString dirDownloads(bool create_dir); @@ -131,7 +133,9 @@ accept(); - QDesktopServices::openUrl(QUrl::fromLocalFile(ui.fileName->text())); + // QDesktopServices::openUrl(QUrl::fromLocalFile(ui.fileName->text())); + QProcess* process = new QProcess(BrowserApplication::instance()); + process->startDetached( QLatin1String("xdg-open"), QStringList() << ui.fileName->text()); } void SavePDF::getFileName() diff -Nurdb QtWeb-b108/src/searchlineedit.cpp QtWeb-3.8.5/src/searchlineedit.cpp --- QtWeb-b108/src/searchlineedit.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/searchlineedit.cpp 2015-01-12 10:06:03.000000000 +0900 @@ -130,7 +130,7 @@ connect(lineEdit(), SIGNAL(textChanged(const QString &)), this, SIGNAL(textChanged(const QString &))); setLeftWidget(m_searchButton); - m_inactiveText = tr("Search"); +// m_inactiveText = tr("Search"); QSizePolicy policy = sizePolicy(); setSizePolicy(QSizePolicy::Preferred, policy.verticalPolicy()); @@ -149,7 +149,7 @@ r.width() - 2 * horizontalMargin, fm.height()); QPainter painter(this); painter.setPen(palette().brush(QPalette::Disabled, QPalette::Text).color()); - painter.drawText(lineRect, Qt::AlignLeft|Qt::AlignVCenter, m_inactiveText); +// painter.drawText(lineRect, Qt::AlignLeft|Qt::AlignVCenter, m_inactiveText); } else { ExLineEdit::paintEvent(event); } diff -Nurdb QtWeb-b108/src/toolbarsearch.cpp QtWeb-3.8.5/src/toolbarsearch.cpp --- QtWeb-b108/src/toolbarsearch.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/toolbarsearch.cpp 2015-01-20 22:00:14.000000000 +0900 @@ -70,6 +70,7 @@ connect(lineEdit(), SIGNAL(returnPressed()), SLOT(searchNow())); setInactiveText(DEFAULT_PROVIDER); + m_lineEdit->setPlaceholderText(SEARCH_GOOGLE); //add_2015_01_20 load(); @@ -100,6 +101,7 @@ m_stringListModel->setStringList(list); QString engine = settings.value(QLatin1String("searcher"), DEFAULT_PROVIDER).toString(); setInactiveText(engine); + m_lineEdit->setPlaceholderText(engine); //add_2015_01_20 settings.endGroup(); } @@ -123,6 +125,7 @@ { keyword_provider = inactiveText(); setInactiveText(prov); + m_lineEdit->setPlaceholderText(prov); //add_2015_01_20 break; } } @@ -133,21 +136,25 @@ { keyword_provider = inactiveText(); setInactiveText(SEARCH_GOOGLE); + m_lineEdit->setPlaceholderText(SEARCH_GOOGLE); //add_2015_01_20 } else if (kw == SEARCH_YAHOO.toLower()) { keyword_provider = inactiveText(); setInactiveText(SEARCH_YAHOO); + m_lineEdit->setPlaceholderText(SEARCH_YAHOO); //add_2015_01_20 }else if (kw == SEARCH_BING.toLower()) { keyword_provider = inactiveText(); setInactiveText(SEARCH_BING); + m_lineEdit->setPlaceholderText(SEARCH_BING); //add_2015_01_20 }else if (kw == SEARCH_CUIL.toLower()) { keyword_provider = inactiveText(); setInactiveText(SEARCH_CUIL); + m_lineEdit->setPlaceholderText(SEARCH_CUIL); //add_2015_01_20 } } if (!keyword_provider.isEmpty()) @@ -186,7 +193,8 @@ else if (inactiveText() == SEARCH_YAHOO) { - url.setUrl(QLatin1String("http://search.yahoo.com/search")); +url.setUrl(QLatin1String("http://search.yahoo.co.jp/search")); +// url.setUrl(QLatin1String("http://search.yahoo.com/search")); url.addQueryItem(QLatin1String("p"), searchText); url.addQueryItem(QLatin1String("ei"), QLatin1String("UTF-8")); } @@ -218,6 +226,7 @@ if (!keyword_provider.isEmpty()) { setInactiveText(keyword_provider); + m_lineEdit->setPlaceholderText(keyword_provider); //add_2015_01_20 } emit search(url); @@ -241,6 +250,7 @@ { save(); setInactiveText(SEARCH_GOOGLE); + m_lineEdit->setPlaceholderText(SEARCH_GOOGLE); //add_2015_01_20 checkGoogleSuggest( true ); if (!lineEdit()->text().isEmpty()) searchNow(); @@ -250,6 +260,7 @@ { save(); setInactiveText(SEARCH_BING); + m_lineEdit->setPlaceholderText(SEARCH_BING); //add_2015_01_20 if (!lineEdit()->text().isEmpty()) searchNow(); } @@ -258,6 +269,7 @@ { save(); setInactiveText(SEARCH_YAHOO); + m_lineEdit->setPlaceholderText(SEARCH_YAHOO); //add_2015_01_20 checkGoogleSuggest( false ); if (!lineEdit()->text().isEmpty()) searchNow(); @@ -267,6 +279,7 @@ { save(); setInactiveText(SEARCH_CUIL); + m_lineEdit->setPlaceholderText(SEARCH_CUIL); //add_2015_01_20 checkGoogleSuggest( false ); if (!lineEdit()->text().isEmpty()) searchNow(); @@ -283,6 +296,7 @@ QString text = action->statusTip(); setInactiveText(text); + m_lineEdit->setPlaceholderText(text); //add_2015_01_20 checkGoogleSuggest( text == SEARCH_GOOGLE ); diff -Nurdb QtWeb-b108/src/webpage.cpp QtWeb-3.8.5/src/webpage.cpp --- QtWeb-b108/src/webpage.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/webpage.cpp 2014-03-17 20:02:15.000000000 +0900 @@ -57,7 +57,7 @@ #include #include #include -#include +//#include #include #include diff -Nurdb QtWeb-b108/src/webview.cpp QtWeb-3.8.5/src/webview.cpp --- QtWeb-b108/src/webview.cpp 2013-09-09 21:38:29.000000000 +0900 +++ QtWeb-3.8.5/src/webview.cpp 2015-01-20 21:53:20.000000000 +0900 @@ -56,7 +56,7 @@ #include #include #include -#include +//#include #include #include @@ -110,6 +110,7 @@ setTextSizeMultiplier(ratio); QWebSettings::globalSettings()->setAttribute(QWebSettings::ZoomTextOnly, zoom_text_only); } + page()->settings()->setDefaultTextEncoding("Shift_JIS"); } void WebView::slotInspectElement()