[elvystrac] r1699 - fixed : ordering of categories now preserves active category, filecache is used now
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Wed, 10 Feb 2010 11:02:33 +0100
Author: JirkaH
Date: 2010-02-10 11:02:33 +0100 (Wed, 10 Feb 2010)
New Revision: 1699
Modified:
trunk/client/elvys-client/src/Makefile
trunk/client/elvys-client/src/categorymanager.cpp
trunk/client/elvys-client/src/elvys.cpp
trunk/client/elvys-client/src/pdfviewer.cpp
trunk/client/elvys-client/src/pdfzoomed.cpp
trunk/client/elvys-client/src/videodocument.cpp
Log:
fixed : ordering of categories now preserves active category, filecache is used
now
Modified: trunk/client/elvys-client/src/Makefile
===================================================================
--- trunk/client/elvys-client/src/Makefile 2010-02-10 09:25:44 UTC (rev
1698)
+++ trunk/client/elvys-client/src/Makefile 2010-02-10 10:02:33 UTC (rev
1699)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: ../bin/elvys-client
-# Generated by qmake (2.01a) (Qt 4.5.3) on: Fri Feb 5 11:19:35 2010
+# Generated by qmake (2.01a) (Qt 4.5.3) on: Wed Feb 10 10:48:49 2010
# Project: src.pro
# Template: app
# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=debug_and_release -o Makefile src.pro
Modified: trunk/client/elvys-client/src/categorymanager.cpp
===================================================================
--- trunk/client/elvys-client/src/categorymanager.cpp 2010-02-10 09:25:44 UTC
(rev 1698)
+++ trunk/client/elvys-client/src/categorymanager.cpp 2010-02-10 10:02:33 UTC
(rev 1699)
@@ -129,14 +129,21 @@
QMap<int, int>::iterator i;
QMap<int, Category *> mapping;
int id;
- int x;
+ int x, index;
+ Category * curCat;
+
+
+ //Look for the categories in my tab widget
for (i = orderMap.begin(); i != orderMap.end(); ++i) {
id = i.key();
if ( (cat = findChild<Category *>(QString("%1").arg(id))) ==
NULL ) {
qWarning() << Q_FUNC_INFO << "category with id " << id
<< "doesn't exists!!";
} else {
- if (indexOf(cat) != -1) { //make sure that this
category is displayed
+ if ((index = indexOf(cat)) != -1) { //make sure that
this category is displayed
+ if ( index == currentIndex() ) {
+ curCat = cat;
+ }
mapping[i.value()] = cat;
}
}
@@ -156,7 +163,6 @@
if (ok) //everything is ok, no need to move tabs
return;
- int currIndex = currentIndex();
///< @todo clear here makes unnecessary flickering and reloading of all
documents. Idealy, it should just change order of tabs and NOT reaload them
completely.
clear(); // deletes all tab widgets
@@ -166,7 +172,7 @@
addTab(cat, cat->name());
}
- setCurrentIndex(currIndex);
+ setCurrentWidget(curCat);
}
/** Creates new category with given @a id and @a name
Modified: trunk/client/elvys-client/src/elvys.cpp
===================================================================
--- trunk/client/elvys-client/src/elvys.cpp 2010-02-10 09:25:44 UTC (rev
1698)
+++ trunk/client/elvys-client/src/elvys.cpp 2010-02-10 10:02:33 UTC (rev
1699)
@@ -70,11 +70,13 @@
filecache = new FileCacheMaintainer();
filecache->setDataDir(AppConfig::getInstance()->getLocalDataDir());
+ filecache->maintain();
connect(timer, SIGNAL(timeout()), this, SLOT(checkAvailableSpace()));
timer->start(600*1000);
//modeChanger.start();
-
+
+ QPixmapCache::setCacheLimit(PIXMAP_CACHE_LIMIT);
}
void Elvys::keyPressEvent ( QKeyEvent * event ) {
Modified: trunk/client/elvys-client/src/pdfviewer.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfviewer.cpp 2010-02-10 09:25:44 UTC (rev
1698)
+++ trunk/client/elvys-client/src/pdfviewer.cpp 2010-02-10 10:02:33 UTC (rev
1699)
@@ -444,7 +444,7 @@
void PDFViewer::paintEvent(QPaintEvent * event) {
Q_UNUSED(event);
- if ( ! zoomed ) {
+ if ( ! zoomed ) {
if ( QPixmapCache::find(getPageKey(size(),
SMALL_PAGE_IDENTIFIER)) == false) {
getFirstPageSmall();
return;
Modified: trunk/client/elvys-client/src/pdfzoomed.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfzoomed.cpp 2010-02-10 09:25:44 UTC (rev
1698)
+++ trunk/client/elvys-client/src/pdfzoomed.cpp 2010-02-10 10:02:33 UTC (rev
1699)
@@ -20,8 +20,7 @@
/** Contructor.
*/
-PDFZoomed::PDFZoomed() {
- QPixmapCache::setCacheLimit(PIXMAP_CACHE_LIMIT);
+PDFZoomed::PDFZoomed() {
scaleI = 1000;
scaleD = (double)scaleI/1000.0L;
keyBase = "PDFZOOMED";
Modified: trunk/client/elvys-client/src/videodocument.cpp
===================================================================
--- trunk/client/elvys-client/src/videodocument.cpp 2010-02-10 09:25:44 UTC
(rev 1698)
+++ trunk/client/elvys-client/src/videodocument.cpp 2010-02-10 10:02:33 UTC
(rev 1699)
@@ -55,7 +55,7 @@
player->load(source);
player->setVolume(0);
- slider->setMediaObject(player->mediaObject());
+ slider->setMediaObject(player->mediaObject());
}
void VideoDocument::load(QString _name, int docId) {
@@ -111,7 +111,9 @@
void VideoDocument::manageAutoStart() {
if (_autoStart) {
slider->show();
- play(); //starts playing if not already doing so
+ if (isVisible()) {
+ play(); //starts playing if not already doing so
+ }
} else { // we dont stop playing if it already started
slider->hide();
}
Other related posts:
- » [elvystrac] r1699 - fixed : ordering of categories now preserves active category, filecache is used now - elvys
