Skip to content
Browse files

Merge pull request #51 from Akeru/master

Some small fixes
  • Loading branch information...
2 parents 61d6b49 + 1aa451d commit c980aa7617e6de27c21a0071697df40a45b39353 @Gnurou committed May 30, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 src/core/kanjidic2/CMakeLists.txt
  3. +2 −2 src/gui/EntriesViewHelper.cc
  4. +1 −1 src/gui/MainWindow.cc
  5. +1 −1 src/sqlite/sqlite3ext.cc
View
2 CMakeLists.txt
@@ -30,7 +30,7 @@ endif(UNIX AND NOT APPLE AND NOT DATA_DIR)
# 64 bits Intel binary with 10.6 compatibility
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "${ARCHS_STANDARD_64_BIT}")
- set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk")
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
set(CMAKE_PREFIX_PATH "${CMAKE_OSX_SYSROOT}/usr")
set(CMAKE_FRAMEWORK_PATH "${CMAKE_OSX_SYSROOT}/Library/Frameworks:${CMAKE_OSX_SYSROOT}/System/")
View
2 src/core/kanjidic2/CMakeLists.txt
@@ -2,7 +2,7 @@
set(QT_DONT_USE_QTGUI TRUE)
set(KANJIDIC2_SOURCE http://www.csse.monash.edu.au/~jwb/kanjidic2/kanjidic2.xml.gz)
-set(KANJIVG_SOURCE https://github.com/downloads/KanjiVG/kanjivg/kanjivg-20120401.xml.gz)
+set(KANJIVG_SOURCE http://cloud.github.com/downloads/KanjiVG/kanjivg/kanjivg-20120401.xml.gz)
# Kanjidic2
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/3rdparty/kanjidic2.xml)
View
4 src/gui/EntriesViewHelper.cc
@@ -336,7 +336,7 @@ void EntriesViewHelper::printBookletPreview()
void EntriesViewHelper::tabExport()
{
- QString exportFile = QFileDialog::getSaveFileName(0, tr("Export to tab-separated file..."));
+ QString exportFile = QFileDialog::getSaveFileName(0, tr("Export to tab-separated file..."), "export.tsv");
if (exportFile.isEmpty()) return;
QFile outFile(exportFile);
if (!outFile.open(QIODevice::WriteOnly)) {
@@ -383,7 +383,7 @@ static QString escapeQuotes(const QString &str)
void EntriesViewHelper::jsExport()
{
- QString exportFile = QFileDialog::getSaveFileName(0, tr("Export to HTML flashcard file..."), QString(), tr("HTML files (*.html)"));
+ QString exportFile = QFileDialog::getSaveFileName(0, tr("Export to HTML flashcard file..."), "flashcard.html", tr("HTML files (*.html)"));
if (exportFile.isEmpty()) return;
QFile outFile(exportFile);
if (!outFile.open(QIODevice::WriteOnly)) {
View
2 src/gui/MainWindow.cc
@@ -232,7 +232,7 @@ void MainWindow::donationReminderCheck()
void MainWindow::exportUserData()
{
- QString to(QFileDialog::getSaveFileName(this, tr("Export user data...")));
+ QString to(QFileDialog::getSaveFileName(this, tr("Export user data..."), "export.dat"));
if (to.isEmpty()) return;
QFile dataFile(Database::instance()->userDBFile());
View
2 src/sqlite/sqlite3ext.cc
@@ -386,7 +386,7 @@ static int katakanaCreate(
t->delim[i] = !isalnum(i);
}
// '.' is used in kanji readings and should not be a delimiter
- t->delim['.'] = 0;
+ t->delim[(int)'.'] = 0;
}
*ppTokenizer = &t->base;

0 comments on commit c980aa7

Please sign in to comment.
Something went wrong with that request. Please try again.