Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

RELEASE 1.10

Committing all new modifications for the official Coquillo 1.10 release.
  • Loading branch information...
commit 92d47d84590f6f9b052631d4962926d5255dbafa 1 parent 20d8eb8
@sjuvonen authored
View
2  CHANGES
@@ -1,4 +1,4 @@
-git
+1.10
- Most of the code has been rewritten for easier maintaining and development.
- Secondary goal is to fix compiling on Windows and OS/2.
- Changed the order of Processor dialog pages.
View
1  common.pri
@@ -4,4 +4,3 @@ unix {
PREFIX = /usr
}
}
-
View
92 coquillo.pro
@@ -1,10 +1,18 @@
include(common.pri)
-TEMPLATE = subdirs
-CONFIG += ordered
+TEMPLATE = app
-SUBDIRS += src/core src/gui
-SUBDIRS += src
+QT += network
+
+MOC_DIR = build
+OBJECTS_DIR = build
+UI_DIR = build
+
+INCLUDEPATH += src/core src/gui
+INCLUDEPATH += src/gui/bookmarks/ src/gui/cddb/
+INCLUDEPATH += src/
+
+RESOURCES += coquillo.qrc
unix {
DATADIR = $$PREFIX/share
@@ -14,12 +22,86 @@ unix {
icons.files = extra/coquillo.png
launcher.path = $$DATADIR/applications
- launches.files = extra/coquillo.desktop
+ launcher.files = extra/coquillo.desktop
+ target.path = $$PREFIX/bin
+
+ INSTALLS += target
INSTALLS += icons launcher
+
+ LIBS += -ltag
}
win32 {
+ INCLUDEPATH += ../resources/windows/taglib/include
+ LIBS += ../resources/windows/taglib/taglib.dll
+
CONFIG += windows
RC_FILE = coquillo.rc
}
+
+FORMS += src/ui/MainWindow.ui \
+ src/ui/AboutApp.ui \
+ src/ui/BookmarkDialog.ui \
+ src/ui/CddbSearchDialog.ui \
+ src/ui/DirectorySelector.ui \
+ src/ui/EditorWidget.ui \
+ src/ui/ProcessorWidget.ui \
+ src/ui/SettingsDialog.ui \
+
+HEADERS += src/Coquillo.h \
+
+SOURCES += src/Coquillo.cpp \
+ src/main.cpp \
+
+HEADERS += src/core/globals.h \
+ src/core/MediaScanner.h \
+ src/core/MetaData.h \
+ src/core/MetaDataImage.h \
+ src/core/MetaDataModel2.h \
+ src/core/MetaDataReader.h \
+ src/core/MetaDataWriter.h \
+ src/core/ModelDataInspector.h \
+
+SOURCES += src/core/globals.cpp \
+ src/core/MediaScanner.cpp \
+ src/core/MetaData.cpp \
+ src/core/MetaDataImage.cpp \
+ src/core/MetaDataModel2.cpp \
+ src/core/MetaDataReader.cpp \
+ src/core/MetaDataWriter.cpp \
+ src/core/ModelDataInspector.cpp \
+
+HEADERS += src/gui/DirectorySelectorWidget.h \
+ src/gui/DataWidget.h \
+ src/gui/EditorWidget.h \
+ src/gui/FileSystemProxyModel.h \
+ src/gui/MainWindow.h \
+ src/gui/ProcessorWidget.h \
+
+SOURCES += src/gui/DirectorySelectorWidget.cpp \
+ src/gui/DataWidget.cpp \
+ src/gui/EditorWidget.cpp \
+ src/gui/FileSystemProxyModel.cpp \
+ src/gui/MainWindow.cpp \
+ src/gui/ProcessorWidget.cpp \
+
+HEADERS += src/gui/bookmarks/BookmarkDialog.h \
+ src/gui/bookmarks/BookmarkModel.h \
+
+SOURCES += src/gui/bookmarks/BookmarkDialog.cpp \
+ src/gui/bookmarks/BookmarkModel.cpp \
+
+HEADERS += src/gui/cddb/Cddb.h \
+ src/gui/cddb/CddbPrivate.h \
+ src/gui/cddb/CddbSearchDialog.h \
+
+SOURCES += src/gui/cddb/Cddb.cpp \
+ src/gui/cddb/CddbPrivate.cpp \
+ src/gui/cddb/CddbSearchDialog.cpp \
+
+HEADERS += src/gui/AboutDialog.h \
+ src/gui/SettingsDialog.h \
+
+SOURCES += src/gui/AboutDialog.cpp \
+ src/gui/SettingsDialog.cpp \
View
1  coquillo.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "extra/coquillo.ico"
View
12 libs.pri
@@ -7,12 +7,14 @@ MOC_DIR = $$ROOT/build
OBJECTS_DIR = $$ROOT/build
UI_DIR = $$ROOT/build
+# Remember to update the spec files after changing this!
VERSION = 1.0
-target.path = $$PREFIX/lib/coquillo
-
-win32 {
-
- CONFIG += windows dll
+unix {
+ target.path = $$PREFIX/lib/
+ INSTALLS += target
}
+win32 {
+ CONFIG += dll
+}
View
2  src/core/MetaDataImage.cpp
@@ -27,7 +27,7 @@ void MetaDataImage::setImage(const QImage & image) {
if (image.isNull())
return;
- _id = qChecksum((const char *)(image.constBits()), image.byteCount());
+ _id = qChecksum((const char *)(image.bits()), image.byteCount());
if (_id == 0)
return;
View
2  src/core/MetaDataModel2.cpp
@@ -257,7 +257,7 @@ bool MetaDataModel2::removeRows(int start, int count, const QModelIndex & parent
return true;
}
-int MetaDataModel2::columnCount(const QModelIndex & parent) const {
+int MetaDataModel2::columnCount(const QModelIndex &) const {
return MetaData::PicturesField + 1;
}
View
2  src/core/MetaDataWriter.cpp
@@ -60,6 +60,7 @@ void MetaDataWriter::write() {
switch (type) {
+ #if TAGLIB_MINOR_VERSION >= 7 || TAGLIB_MAJOR_VERSION > 1
case FlacFile: {
TagLib::FLAC::File * file = dynamic_cast<TagLib::FLAC::File*>(fileref.file());
@@ -90,6 +91,7 @@ void MetaDataWriter::write() {
break;
}
+ #endif
case OggVorbisFile: {
TagLib::Vorbis::File * file = dynamic_cast<TagLib::Vorbis::File*>(fileref.file());
View
4 src/gui/DirectorySelectorWidget.cpp
@@ -27,6 +27,10 @@ DirectorySelectorWidget::DirectorySelectorWidget(QWidget * parent) : QWidget(par
_ui->directories->setModel(_proxy);
_ui->directories->viewport()->installEventFilter(this);
+
+ #if QT_MINOR_VERSION >= 7 || QT_MAJOR_VERSION > 4
+ _ui->location->setPlaceholderText(tr("Path"));
+ #endif
}
QString DirectorySelectorWidget::path() const {
View
4 src/main.cpp
@@ -12,8 +12,8 @@
void printHelp();
-const char * releaseDate = "n/a";
-const char * applicationVersion = "git";
+const char * releaseDate = RELEASE_DATE;
+const char * applicationVersion = APPLICATION_VERSION;
int main(int argc, char ** argv) {
QApplication app(argc, argv);
View
10 src/src.pro
@@ -3,6 +3,7 @@ include(../common.pri)
TEMPLATE = app
TARGET = ../coquillo
+CONFIG += link_prl
QT += network
@@ -13,23 +14,20 @@ MOC_DIR = ../build
OBJECTS_DIR = ../build
UI_DIR = ../build
-unix {
-
- # Imports the lib path into the binary
- # QMAKE_RPATHDIR += $$PREFIX/lib/coquillo
+LIBS += -L../lib -lcoquillo_core -lcoquillo_gui
+unix {
target.path = $$PREFIX/bin
INSTALLS += target
}
win32 {
+ CONFIG += windows
INCLUDEPATH += ../resources/windows/taglib/include
LIBS += ../resources/windows/taglib/taglib.dll
}
-LIBS += -L../lib -lcoquillo_core -lcoquillo_gui
-
FORMS += ui/DirectorySelector.ui ui/MainWindow.ui
HEADERS += Coquillo.h \
View
6 src/ui/DirectorySelector.ui
@@ -33,11 +33,7 @@
<number>2</number>
</property>
<item>
- <widget class="QLineEdit" name="location">
- <property name="placeholderText">
- <string>Path</string>
- </property>
- </widget>
+ <widget class="QLineEdit" name="location"/>
</item>
<item>
<widget class="QTreeView" name="directories">
Please sign in to comment.
Something went wrong with that request. Please try again.