Skip to content

Commit

Permalink
Merge branch 'release-0.4.8'
Browse files Browse the repository at this point in the history
0.4.8 (2014_11_09)

Dipydoc's version = 34, 'analysis' reading mode

o every call to DebugMsg() is preceded by a // DEBUGx prefix, allowing to
  keep/the reject debug informations. Updated build scripts.
  (feature108, feature128)
o a-mode
  (feature92, feature97, feature99, feature102, feature103, feature104,
  feature105, feature106, feature107, feature109, feature114, feature115,
  feature116, feature117, feature125)
o fixed DownloadDemoDipydocs constructor so that the DipyDocs stored
  on disk are not deleted if the network is not reachable.
  (feature93)
o Converted script files to Python files; added a build number; added a script
  for win64; added a --console=no|yes option for win builds.
  (feature94, feature112, feature124, feature129)
o  Updated the French translation
  (feature111)

+ feature95, feature96, feature98, feature100, feature110, feature113,
  feature118, feature119, feature120, feature121, feature122, feature123,
  feature127

code quality : 3 errors, according to cpplint.py
  • Loading branch information
suizokukan committed Nov 9, 2014
2 parents 66f4fcd + d7b67fd commit 5c67be5
Show file tree
Hide file tree
Showing 75 changed files with 3,021 additions and 2,132 deletions.
7 changes: 5 additions & 2 deletions README
@@ -1,6 +1,10 @@
(C++/Qt5) front-end used to read texts with some annotations

TODO
* virer le terminal sous win
* virer Icons
* si type apparaît dans main.xml sans être défini, boom
* distinguer un DEBUG2 dans la partie la plus sensible de la boucle d'événements.

[ui]
- ouvrir le(s) dernier(s) fichier(s) ouverts
Expand Down Expand Up @@ -29,14 +33,13 @@ TODO
- document image (http://qt-project.org/doc/qt-5/qpixmap.html#details)

[code]
- plus de pointeurs hors Qt > smart pointers + virer les delete correspondant.
- que faire de bool MainWindow::saveMainFileOfADipyDocAs() ??// READ_AND_WRITE n'est nulle part utilisé.
- réfléchir à la question : le ~/dipydocs est-il complètement nettoyé après un download ? Documenter ce comportement.
- memory leaks : regarder valgrind + g++ -g
- pointeurs const par sécurité partout où c'est possible.
- DebugMsg() sur une seule ligne pour facilement les remplacer par //DebugMsg() pour une version optimisée.
- relire le code : les include sont-ils nécessaires ?
- et si on clique dans l'intro ? comment réagissent les _contains() ?
- réécrire les .sh en script python + inclure un numéro de build.
- dans ... , vérifier que "number", "name" existent :

if( name == "level" ) {
Expand Down
Binary file added art/down.xcf
Binary file not shown.
Binary file added art/level.xcf
Binary file not shown.
Binary file added art/up.xcf
Binary file not shown.
18 changes: 12 additions & 6 deletions cppdipylon/2win32_static/dipylonreader.pro
Expand Up @@ -18,6 +18,7 @@ DEFINES += ALLOW_MOVING_THE_MAINWINDOW
DEFINES += ALLOW_RESIZING_THE_MAINWINDOW
DEFINES += ALLOW_SPLASHSCREEN_AT_START
DEFINES += COMPILE_TO_32BITS_ARCHITECTURE
DEFINES += DEBUG_MESSAGES_TO_CERR
DEFINES += MENUACCESS_TO_INTERNAL_MESSAGES
DEFINES += DOWNLOAD_MP3_VERSION_OF_DIPYDOCS
DEFINES += MAXIMIZE_MAINWINDOW_TRUE_METHOD
Expand All @@ -27,9 +28,11 @@ DEFINES += QT_NO_DEBUG_OUTPUT

#_______________________________________________________________________________
#
# add this line if you want to see qDebug() messages
# Add a console to the application ?
#
# this line will be set by the build script.
#_______________________________________________________________________________
CONFIG += console
@@CONSOLE@@



Expand All @@ -43,8 +46,10 @@ QTPLUGIN += dsengine qtmedia_audioengine
# Input
HEADERS += ./fixedparameters.h \
debugmsg/debugmsg.h \
dipydoc/arrowtarget.h \
dipydoc/dipydoc.h \
dipydoc/dipydocnotes.h \
dipydoc/notes.h \
dipydoc/syntagmas.h \
dipydoc/menunames.h \
languages/languages.h \
languages/languagefromto.h \
Expand Down Expand Up @@ -80,7 +85,8 @@ HEADERS += ./fixedparameters.h \
SOURCES += ./main.cpp \
debugmsg/debugmsg.cpp \
dipydoc/dipydoc.cpp \
dipydoc/dipydocnotes.cpp \
dipydoc/notes.cpp \
dipydoc/syntagmas.cpp \
languages/languagefromto.cpp \
pos/posintext2posinaudio.cpp \
pos/posinaudio2posintext.cpp \
Expand Down Expand Up @@ -123,9 +129,9 @@ RC_FILE = dipylonreader.rc



QMAKE_CFLAGS += -std=c++1y -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wunused-value
QMAKE_CFLAGS += -std=c++1y -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wunused-value -O2

QMAKE_CXXFLAGS += -std=c++1y -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wunused-value
QMAKE_CXXFLAGS += -std=c++1y -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wunused-value -O2

#target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/application
#INSTALLS += target
135 changes: 135 additions & 0 deletions cppdipylon/2win64_static/dipylonreader.pro
@@ -0,0 +1,135 @@
######################################################################
# DipylonReader project : .pro file for Windows/32 bits/static with MXE
######################################################################

TEMPLATE = app
TARGET = dipylonreader
INCLUDEPATH += .
RESOURCES = dipylonreader.qrc
TRANSLATIONS = dipylonreader_French.ts

#_______________________________________________________________________________
#
# compilation options : see dipylonreader.project for more informations
#
#_______________________________________________________________________________
DEFINES += ALLOW_MAXIMIZE_MAINWINDOW
DEFINES += ALLOW_MOVING_THE_MAINWINDOW
DEFINES += ALLOW_RESIZING_THE_MAINWINDOW
DEFINES += ALLOW_SPLASHSCREEN_AT_START
DEFINES += DEBUG_MESSAGES_TO_CERR
DEFINES += MENUACCESS_TO_INTERNAL_MESSAGES
DEFINES += DOWNLOAD_MP3_VERSION_OF_DIPYDOCS
DEFINES += MAXIMIZE_MAINWINDOW_TRUE_METHOD
DEFINES += NO_MAIN_POPUPMENU
DEFINES += STORE_DEBUG_MESSAGES
DEFINES += QT_NO_DEBUG_OUTPUT

#_______________________________________________________________________________
#
# Add a console to the application ?
#
# this line will be set by the build script.
#_______________________________________________________________________________
@@CONSOLE@@


QT += widgets
QT += multimedia

# on Windows, in order to use QMediaPlayer, add the following line :
# (see http://lists.gnu.org/archive/html/mingw-cross-env-list/2013-06/msg00027.html)
QTPLUGIN += dsengine qtmedia_audioengine

# Input
HEADERS += ./fixedparameters.h \
debugmsg/debugmsg.h \
dipydoc/arrowtarget.h \
dipydoc/dipydoc.h \
dipydoc/notes.h \
dipydoc/syntagmas.h \
dipydoc/menunames.h \
languages/languages.h \
languages/languagefromto.h \
pos/posintext2posinaudio.h \
pos/posinaudio2posintext.h \
pos/posinaudio/posinaudio.h \
pos/posinaudio/posinaudiorange.h \
pos/posintext/posintext.h \
pos/posintext/posintextranges.h \
pos/posintext/vectorposintextranges.h \
pos/posintext/posintext2str.h \
qt/arrowformat.h \
qt/blockformat.h \
qt/commentaryeditor.h \
qt/commentarytoolbar.h \
qt/commentaryzone.h \
qt/downloaddemodipydocs.h \
qt/icons.h \
qt/mainwindow.h \
qt/posintextframeformat.h \
qt/presentationscreen.h \
qt/readingmodes.h \
qt/scsplitter.h \
qt/sourceeditor.h \
qt/sourcetoolbar.h \
qt/sourcezone.h \
qt/sctabs.h \
qt/texteditor.h \
qt/textformat.h \
qt/ui.h


SOURCES += ./main.cpp \
debugmsg/debugmsg.cpp \
dipydoc/dipydoc.cpp \
dipydoc/notes.cpp \
dipydoc/syntagmas.cpp \
languages/languagefromto.cpp \
pos/posintext2posinaudio.cpp \
pos/posinaudio2posintext.cpp \
pos/posinaudio/posinaudiorange.cpp \
pos/posintext/posintext2str.cpp \
pos/posintext/posintextranges.cpp \
pos/posintext/vectorposintextranges.cpp \
qt/arrowformat.cpp \
qt/blockformat.cpp \
qt/commentaryeditor.cpp \
qt/commentarytoolbar.cpp \
qt/commentaryzone.cpp \
qt/downloaddemodipydocs.cpp \
qt/icons.cpp \
qt/mainwindow.cpp \
qt/posintextframeformat.cpp \
qt/presentationscreen.cpp \
qt/scsplitter.cpp \
qt/sourceeditor.cpp \
qt/sourcetoolbar.cpp \
qt/sourcezone.cpp \
qt/sctabs.cpp \
qt/texteditor.cpp \
qt/textformat.cpp \
qt/ui.cpp

DESTDIR = build/
OBJECTS_DIR = build/
MOC_DIR = build/
RCC_DIR = build/
UI_DIR = build/

#_______________________________________________________________________________
#
# .rc file used to add the desktop icon to the application
#
# see http://qt-project.org/doc/qt-5/appicon.html
#_______________________________________________________________________________
RC_FILE = dipylonreader.rc



QMAKE_CFLAGS += -std=c++1y -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wunused-value -O2

QMAKE_CXXFLAGS += -std=c++1y -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wunused-value -O2

#target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/application
#INSTALLS += target
1 change: 1 addition & 0 deletions cppdipylon/2win64_static/dipylonreader.rc
@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "./ressources/images/icons/win_app_icon.ico"
Binary file not shown.

0 comments on commit 5c67be5

Please sign in to comment.