fixed issue Sankore-650

preferencesAboutTextFull
unknown 13 years ago
parent 759fe210a7
commit 3d187262fb
  1. 2
      src/core/UBApplication.cpp
  2. 2
      src/core/UBApplication.h
  3. 14
      src/gui/UBLibraryWidget.cpp

@ -35,8 +35,6 @@
#include "UBIdleTimer.h" #include "UBIdleTimer.h"
#include "UBApplicationController.h" #include "UBApplicationController.h"
//#include "softwareupdate/UBSoftwareUpdateController.h"
#include "board/UBBoardController.h" #include "board/UBBoardController.h"
#include "board/UBDrawingController.h" #include "board/UBDrawingController.h"
#include "board/UBBoardView.h" #include "board/UBBoardView.h"

@ -37,7 +37,6 @@ class UBSettings;
class UBPersistenceManager; class UBPersistenceManager;
class UBApplicationController; class UBApplicationController;
class UBDocumentController; class UBDocumentController;
class UBSoftwareUpdateController;
class UBMainWindow; class UBMainWindow;
class UBApplication : public QtSingleApplication class UBApplication : public QtSingleApplication
@ -59,7 +58,6 @@ class UBApplication : public QtSingleApplication
static UBBoardController* boardController; static UBBoardController* boardController;
static UBWebController* webController; static UBWebController* webController;
static UBDocumentController* documentController; static UBDocumentController* documentController;
static UBSoftwareUpdateController* softwareUpdateController;
static UniboardSankoreTransition* mUniboardSankoreTransition; static UniboardSankoreTransition* mUniboardSankoreTransition;
static UBMainWindow* mainWindow; static UBMainWindow* mainWindow;

@ -559,7 +559,7 @@ UBNewFolderDlg::UBNewFolderDlg(QWidget *parent, const char *name):QDialog(parent
{ {
setObjectName(name); setObjectName(name);
setWindowTitle(tr("Add new folder")); setWindowTitle(tr("Add new folder"));
setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint);
mpLabel = new QLabel(tr("New Folder name:"),this); mpLabel = new QLabel(tr("New Folder name:"),this);
mpLineEdit = new QLineEdit(this); mpLineEdit = new QLineEdit(this);
mpAddButton = new QPushButton(tr("Add")); mpAddButton = new QPushButton(tr("Add"));
@ -699,20 +699,8 @@ void UBLibraryWidget::onAddDownloadedFileToLibrary(bool pSuccess, QUrl sourceUrl
Q_UNUSED(pContentHeader); Q_UNUSED(pContentHeader);
if(pSuccess) if(pSuccess)
{ {
// QDir dir;
// dir.mkdir("tmp");
// QString qsFileName = QFileInfo(sourceUrl.toString()).fileName();
// QString qsFilePath = UBFileSystemUtils::normalizeFilePath(QString("tmp/%0").arg(qsFileName));
// QFile f(qsFilePath);
// if(f.open(QIODevice::WriteOnly))
// {
// f.write(pData);
// f.close();
// }
QString urlString = sourceUrl.toString(); QString urlString = sourceUrl.toString();
mLibraryController->routeDataItem(urlString, pData); mLibraryController->routeDataItem(urlString, pData);
// dir.remove(qsFileName);
// dir.rmdir("tmp"); // Due to Qt, the directoy will be removed only if it's empty :)
} }
} }

Loading…
Cancel
Save