Ignore:
Timestamp:
07/04/11 23:42:02 (11 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
526128c
Parents:
8dd3dd2
Message:

Removed the ability to show "pictures" (maps) of rooms and maps of conferences.
The XML file does not contain picture/map/image information of conferences or rooms.
We left the room.picture definition in the database SQL because there is no "drop column"
in sqlite.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/conferenceeditor.cpp

    r8dd3dd2 re6ab8a2  
    2222#include "conferencemodel.h"
    2323#include "urlinputdialog.h"
    24 #include "mapwindow.h"
    2524#include "errormessage.h"
    2625
     
    5150    connect(changeUrl, SIGNAL(clicked()), SLOT(changeUrlClicked()));
    5251    connect(refreshBtn, SIGNAL(clicked()), SLOT(refreshClicked()));
    53     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
    5452    connect(buttonBox, SIGNAL(rejected()), SLOT(close()));
    5553
     
    9795                + ", " +
    9896                conf.end().toString("dd-MM-yyyy"));
    99 
    100         QString map = conf.map();
    101         if (map.isEmpty()) {
    102             showMapButton->hide();
    103         } else {
    104             showMapButton->show();
    105         }
    106 
    10797        conferenceInfo->setCurrentIndex(0);
    10898        removeBtn->show();
     
    220210}
    221211
    222 void ConferenceEditor::conferenceMapClicked()
    223 {
    224     Conference conf = Conference::getById(selected_id);
    225     QString mapPath = conf.map();
    226     if(mapPath.isEmpty() or !QFile::exists(mapPath)) {
    227         error_message("Map is not available");
    228         return;
    229     }
    230 
    231     QString roomName;
    232 
    233     QPixmap map(mapPath);
    234     MapWindow window(map,roomName,this);
    235     window.exec();
    236 }
Note: See TracChangeset for help on using the changeset viewer.