Merge branch 'master' of git@f-r-e-i.de:/home/git/repo/rplqt

Conflicts:
	appl/refind/mainwindow.cpp
	appl/refind/refind.pro

diff --cc appl/refind/mainwindow.cpp
index ccf3ecff8d2a035605f623a7887fd549ddb5fac1,7c6b74520b101cddda10c62abe402078014b0f90..ac74665a0e8555ffa7e5ec96225b3a74514d1c2c
--- 1/appl/refind/mainwindow.cpp
--- 2/appl/refind/mainwindow.cpp
+++ b/appl/refind/mainwindow.cpp
@@@ -93,39 -90,9 +93,41 @@@ MainWindow::MainWindow(const QString& s
     ui->tableWidget->setColumnWidth(TC_SIZE, 125);
     ui->tableWidget->setColumnWidth(TC_MODIFIED, 175);
     ui->tableWidget->setColumnWidth(TC_TYPE, 75);
 -   ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
 +   addContextMenu();
  }
  
 +/**
 + * @brief Destructor.
 + */
 +MainWindow::~MainWindow(){
 +   delete ui;
 +}
 +
 +/**
 + * Prepares the context menu of the result table.
 + *
 + */
 +void MainWindow::addContextMenu(){
 +    ui->tableWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 +    connect(ui->tableWidget,
 +            SIGNAL(customContextMenuRequested(const QPoint&)),
 +            SLOT(handleTableContextMenu(const QPoint&)));
 +    ContextHandler* handler = new ContextHandler();
 +    handler->m_text = "kedit";
 +    handler->m_program = "kedit";
 +    handler->m_arguments = "${full}";
 +    handler->m_changeToParentDirectory = ContextHandler::DM_UNDEF;
 +    m_fileHandler.append(handler);
 +    handler = new ContextHandler();
 +    handler->m_text = "bash";
 +    handler->m_program = "konsole";
 +    handler->m_arguments = "${full}";
 +    handler->m_changeToParentDirectory = ContextHandler::DM_TO_FILE;
 +    m_dirHandler.append(handler);
 +}
 +
++=======
++>>>>>>> branch 'master' of git@f-r-e-i.de:/home/git/repo/rplqt
  void MainWindow::mousePressEvent(QMouseEvent* event)
  {
      if (event->button() == Qt::LeftButton