diff -Nurdp QtWeb-b104/browserapplication.cpp QtWeb-b104b/browserapplication.cpp --- QtWeb-b104/browserapplication.cpp 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/browserapplication.cpp 2013-08-18 07:25:37.000000000 +0900 @@ -109,12 +109,13 @@ BrowserApplication::BrowserApplication(i QString serverName = QCoreApplication::applicationName(); // Define the base location - Should be ended with a slash! - s_exeLocation = QCoreApplication::arguments()[0]; - int i = s_exeLocation.lastIndexOf( QDir::separator() ); - if (i == -1) - s_exeLocation = ""; - else - s_exeLocation = s_exeLocation.left(i+1); +// s_exeLocation = QCoreApplication::arguments()[0]; +// int i = s_exeLocation.lastIndexOf( QDir::separator() ); +// if (i == -1) +// s_exeLocation = ""; +// else +// s_exeLocation = s_exeLocation.left(i+1); + s_exeLocation = QDir::homePath() + "/.config/qtweb/"; definePortableRunMode(); diff -Nurdp QtWeb-b104/browsermainwindow.cpp QtWeb-b104b/browsermainwindow.cpp --- QtWeb-b104/browsermainwindow.cpp 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/browsermainwindow.cpp 2013-08-17 10:49:01.000000000 +0900 @@ -1090,6 +1090,7 @@ void BrowserMainWindow::slotAboutToShowE // japanese alignmentGroup->addAction(menuAddEncoding("Japanese", "ISO-2022-JP")); alignmentGroup->addAction(menuAddEncoding("Japanese", "EUC-JP")); + alignmentGroup->addAction(menuAddEncoding("Japanese", "Shift_JIS")); m_encodingMenu->addSeparator(); alignmentGroup->addAction(menuAddEncoding("Cyrillic", "ISO-8859-5")); @@ -1699,9 +1700,9 @@ void BrowserMainWindow::slotUpdateWindow 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::emptyCache() @@ -2443,11 +2444,11 @@ void BrowserMainWindow::slotEncodingChan return; m_currentEncoding = action->statusTip(); - WebView *view = currentTab(); if (!view) return; - +//add 2013.8.16 +view->page()->settings()->setDefaultTextEncoding(m_currentEncoding.toAscii()); view->reload(); } diff -Nurdp QtWeb-b104/build.sh QtWeb-b104b/build.sh --- QtWeb-b104/build.sh 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/build.sh 2013-09-02 20:53:14.000000000 +0900 @@ -128,7 +128,7 @@ if ! $SKIP_QT_BUILD; then OPTIONS+=' -no-gstreamer' OPTIONS+=' -no-sql-sqlite' OPTIONS+=' -no-accessibility' - OPTIONS+=' -D QT_NO_STYLE_CDE' + OPTIONS+=' -D QT_NO_STYLE_GTK' OPTIONS+=' -D QT_NO_STYLE_MOTIF' OPTIONS+=' -optimized-qmake' @@ -166,14 +166,16 @@ if ! $SKIP_QT_BUILD; then make confclean fi - OPENSSL_LIBS="$SSL_LIBS" ./configure -prefix $PWD $OPTIONS && make -j$COMPILE_JOBS || qt_error +# OPENSSL_LIBS="$SSL_LIBS" ./configure -prefix $PWD $OPTIONS && make -j$COMPILE_JOBS || qt_error + OPENSSL_LIBS="$SSL_LIBS" ./configure -prefix $PWD $OPTIONS && make || qt_error cd ../.. fi # end of Qt build rm -rf build && mkdir -p build && cd build export QTDIR=../src/qt ../src/qt/bin/qmake -config release ../QtWeb.pro -make -j$COMPILE_JOBS +#make -j$COMPILE_JOBS +make #fix qt_menu.nib issue if [[ $OSTYPE = darwin* ]]; then diff -Nurdp QtWeb-b104/downloadmanager.cpp QtWeb-b104b/downloadmanager.cpp --- QtWeb-b104/downloadmanager.cpp 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/downloadmanager.cpp 2013-08-14 09:38:59.000000000 +0900 @@ -320,7 +320,6 @@ bool ShellExec(QString path) { QProcess* process = new QProcess(BrowserApplication::instance()); process->start( app, QStringList() << cmd); - return true; } @@ -344,7 +343,7 @@ bool ShellExec(QString path) bool ShellExec(QString path) { QProcess* process = new QProcess(BrowserApplication::instance()); - if (!process->startDetached( QLatin1String("konqueror"), QStringList() << path)) + if (!process->startDetached( QLatin1String("xdg-open"), QStringList() << path)) { QFileInfo info(path); if (!process->startDetached( QLatin1String("konqueror"), QStringList() << info.absolutePath())) @@ -845,7 +844,9 @@ QString dirDownloads(bool create_dir) void DownloadManager::open_downloads() { - ShellExec( dirDownloads( true ) ); + QProcess* process = new QProcess(BrowserApplication::instance()); + process->start( QLatin1String("rox"), QStringList() << dirDownloads( true )); +// ShellExec( dirDownloads( true ) ); } diff -Nurdp QtWeb-b104/exlineedit.cpp QtWeb-b104b/exlineedit.cpp --- QtWeb-b104/exlineedit.cpp 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/exlineedit.cpp 2013-08-17 15:35:06.000000000 +0900 @@ -188,12 +188,11 @@ ExLineEdit::ExLineEdit(QWidget *parent, // 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)); m_lineEdit->setPalette(clearPalette); - // clearButton m_clearButton = new ClearButton(this); connect(m_lineEdit, SIGNAL(textChanged(const QString&)), @@ -325,6 +324,3 @@ void ExLineEdit::paintEvent(QPaintEvent initStyleOption(&panel); style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this); } - - - diff -Nurdp QtWeb-b104/toolbarsearch.cpp QtWeb-b104b/toolbarsearch.cpp --- QtWeb-b104/toolbarsearch.cpp 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/toolbarsearch.cpp 2013-08-15 19:41:53.000000000 +0900 @@ -188,7 +188,7 @@ void ToolbarSearch::searchNow() else if (inactiveText() == SEARCH_YAHOO) { - url.setUrl(QLatin1String("http://search.yahoo.com/search")); + url.setUrl(QLatin1String("http://search.yahoo.co.jp/search")); url.addQueryItem(QLatin1String("p"), searchText); url.addQueryItem(QLatin1String("ei"), QLatin1String("UTF-8")); } diff -Nurdp QtWeb-b104/webview.cpp QtWeb-b104b/webview.cpp --- QtWeb-b104/webview.cpp 2013-05-20 06:19:55.000000000 +0900 +++ QtWeb-b104b/webview.cpp 2013-08-16 18:31:41.000000000 +0900 @@ -342,15 +342,15 @@ void WebView::applyEncoding() m_encoding_in_progress = true; m_current_encoding = enc; m_current_encoding_url = url(); - QString output = decoder->toUnicode(html.toAscii()); - mainframe->setHtml(output, mainframe->url()); +// QString output = decoder->toUnicode(html.toAscii()); +// mainframe->setHtml(output, mainframe->url()); QList children = mainframe->childFrames(); foreach(QWebFrame *frame, children) { - html = frame->toHtml(); - output = decoder->toUnicode(html.toAscii()); - frame->setHtml(output, frame->url()); +// html = frame->toHtml(); +// output = decoder->toUnicode(html.toAscii()); +// frame->setHtml(output, frame->url()); } m_encoding_in_progress = false; }