Merge new version 0.11.0 from experimental to unstable

9 years ago · b370555cc3
parent 866039af05
commit b370555cc3
40 changed files with 2114 additions and 1701 deletions
--- a/2
+++ b/2
@ -3,4 +3,4 @@ Upstream Authors:
    Hong Jen Yee (PCMan) <pcman.tw@gmail.com>

 Copyright:
-    Copyright (c) 2013-2015 LXQt team
+    Copyright (c) 2013-2016 LXQt team
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -7,7 +7,7 @@ if (POLICY CMP0063)
 endif (POLICY CMP0063)

 set(PCMANFM_QT_VERSION_MAJOR 0)
-set(PCMANFM_QT_VERSION_MINOR 10)
+set(PCMANFM_QT_VERSION_MINOR 11)
 set(PCMANFM_QT_VERSION_PATCH 0)
 set(PCMANFM_QT_VERSION ${PCMANFM_QT_VERSION_MAJOR}.${PCMANFM_QT_VERSION_MINOR}.${PCMANFM_QT_VERSION_PATCH})

--- a/README.md
+++ b/README.md
@ -2,9 +2,6 @@

 The Qt port of the LXDE file manager PCManFM.

-Includes libfm-qt, the Qt port of the libfm - a library providing components to
-build desktop file managers.
-
 Issue tracker:
  https://github.com/lxde/pcmanfm-qt/issues

--- a/cmake/LXQtTranslateDesktop.cmake
+++ b/cmake/LXQtTranslateDesktop.cmake
@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
        set(_pattern "'\\[.*]\\s*='")
        if (_translations)
            add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-                COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
+                COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+                COMMAND grep -a -h ${_pattern} ${_translations} >> ${_outFile}
                COMMENT "Generating ${_fileName}${_fileExt}"
            )
        else()
            add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+                COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
                COMMENT "Generating ${_fileName}${_fileExt}"
            )
        endif()
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,17 @@
+pcmanfm-qt (0.11.0-2) unstable; urgency=medium
+
+  * Merge experimental to unstable 
+
+ -- Alf Gaida <agaida@siduction.org>  Thu, 31 Mar 2016 22:07:11 +0200
+
+pcmanfm-qt (0.11.0-1) experimental; urgency=medium
+
+  * New upstream release
+  * Removed grep patch
+  * Bump libfm-qt-dev (>= 0.11.0)
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 28 Mar 2016 18:12:27 +0200
+
 pcmanfm-qt (0.10.1-2) unstable; urgency=medium

  * Bump Standards to 3.9.7
--- a/debian/control
+++ b/debian/control
@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9.20151219),
               qttools5-dev,
               qttools5-dev-tools
 Standards-Version: 3.9.7
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.qt/?h=debian/sid
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git -b debian/sid
 Homepage: https://github.com/lxde/pcmanfm-qt

--- a/pcmanfm/CMakeLists.txt
+++ b/pcmanfm/CMakeLists.txt
@ -62,6 +62,7 @@ set_property(

 target_include_directories(pcmanfm-qt
    PRIVATE "${LIB_XCB_INDLUDE_DIRS}"
+    "${Qt5Gui_PRIVATE_INCLUDE_DIRS}"
 )

 target_link_libraries(pcmanfm-qt
--- a/pcmanfm/application.cpp
+++ b/pcmanfm/application.cpp
@ -189,8 +189,7 @@ bool Application::parseCommandLineArgs() {
  QCommandLineOption setWallpaperOption(QStringList() << "w" << "set-wallpaper", tr("Set desktop wallpaper from image FILE"), tr("FILE"));
  parser.addOption(setWallpaperOption);

-  // don't translate list of modes in description, please
-  QCommandLineOption wallpaperModeOption("wallpaper-mode", tr("Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)"), tr("MODE"));
+  QCommandLineOption wallpaperModeOption("wallpaper-mode", tr("Set mode of desktop wallpaper. MODE=(%1)").arg("color|stretch|fit|center|tile"), tr("MODE"));
  parser.addOption(wallpaperModeOption);

  QCommandLineOption showPrefOption("show-pref", tr("Open Preferences dialog on the page with the specified name"), tr("NAME"));
@ -518,7 +517,7 @@ void Application::preferences(QString page) {
    preferencesDialog_ = new PreferencesDialog(page);
  }
  else {
-    // TODO: set page
+    preferencesDialog_.data()->selectPage(page);
  }
  preferencesDialog_.data()->show();
  preferencesDialog_.data()->raise();
--- a/pcmanfm/application.h
+++ b/pcmanfm/application.h
@ -31,7 +31,6 @@
 #include <QTranslator>
 #include <gio/gio.h>

-
 class QScreen;

 class QFileSystemWatcher;
--- a/pcmanfm/desktop-preferences.ui
+++ b/pcmanfm/desktop-preferences.ui
@ -200,6 +200,82 @@
         </layout>
        </widget>
       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Spacing</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>Minimum item margins:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="hMargin">
+            <property name="toolTip">
+             <string>3 px by default.</string>
+            </property>
+            <property name="suffix">
+             <string> px</string>
+            </property>
+            <property name="maximum">
+             <number>48</number>
+            </property>
+            <property name="value">
+             <number>3</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>x</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3">
+           <widget class="QSpinBox" name="vMargin">
+            <property name="toolTip">
+             <string>1 px by default.
+A space is also reserved for 3 lines of text.</string>
+            </property>
+            <property name="suffix">
+             <string> px</string>
+            </property>
+            <property name="maximum">
+             <number>48</number>
+            </property>
+            <property name="value">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="4">
+           <widget class="QCheckBox" name="lockMargins">
+            <property name="text">
+             <string>Lock</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="5">
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>5</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
       <item>
        <spacer name="verticalSpacer_2">
         <property name="orientation">
--- a/pcmanfm/desktopitemdelegate.cpp
+++ b/pcmanfm/desktopitemdelegate.cpp
@ -34,7 +34,8 @@ DesktopItemDelegate::DesktopItemDelegate(QListView* view, QObject* parent):
  QStyledItemDelegate(parent ? parent : view),
  view_(view),
  symlinkIcon_(QIcon::fromTheme("emblem-symbolic-link")),
-  shadowColor_(0, 0, 0) {
+  shadowColor_(0, 0, 0),
+  margins_(QSize(3, 3)) {
 }

 // FIXME: we need to figure out a way to derive from Fm::FolderItemDelegate to avoid code duplication.
@ -74,7 +75,7 @@ void DesktopItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
  }

  // draw text
-  QSize gridSize = view_->gridSize() - QSize(6, 6);
+  QSize gridSize = view_->gridSize() - 2 * margins_;
  QRectF textRect(opt.rect.x() - (gridSize.width() - opt.rect.width()) / 2,
                  opt.rect.y() + opt.decorationSize.height(),
                  gridSize.width(),
@ -133,10 +134,22 @@ void DesktopItemDelegate::drawText(QPainter* painter, QStyleOptionViewItemV4& op
    return;
  }

-  if((opt.state & QStyle::State_Selected) && opt.widget) {
-    QPalette palette = opt.widget->palette();
+  if (opt.state & QStyle::State_Selected || opt.state & QStyle::State_MouseOver) {
+    if (const QWidget* widget = opt.widget) { // let the style engine do it
+      QStyle* style = widget->style() ? widget->style() : qApp->style();
+      QStyleOptionViewItemV4 o(opt);
+      o.text = QString();
+      o.rect = selRect.toAlignedRect().intersected(opt.rect); // due to clipping and rounding, we might lose 1px
+      o.showDecorationSelected = true;
+      style->drawPrimitive(QStyle::PE_PanelItemViewItem, &o, painter, widget);
+    }
+  }
+
+  if((opt.state & QStyle::State_Selected)) {
    // qDebug("w: %f, h:%f, m:%f", boundRect.width(), boundRect.height(), layout.minimumWidth());
-    painter->fillRect(selRect, palette.highlight());
+    if(!opt.widget)
+      painter->fillRect(selRect, opt.palette.highlight());
+    painter->setPen(opt.palette.color(QPalette::Normal, QPalette::HighlightedText));
  }
  else { // only draw shadow for non-selected items
    // draw shadow, FIXME: is it possible to use QGraphicsDropShadowEffect here?
@ -177,8 +190,7 @@ QSize DesktopItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QM
  opt.decorationAlignment = Qt::AlignHCenter|Qt::AlignTop;
  opt.displayAlignment = Qt::AlignTop|Qt::AlignHCenter;

-  QSize gridSize = view_->gridSize()
-                   - QSize(6, 6); // a 6-px margin is added at FolderView::updateGridSize()
+  QSize gridSize = view_->gridSize() - 2 * margins_;
  Q_ASSERT(gridSize != QSize());
  QRectF textRect(0, 0, gridSize.width(), gridSize.height() - opt.decorationSize.height());
  drawText(NULL, opt, textRect); // passing NULL for painter will calculate the bounding rect only.
--- a/pcmanfm/desktopitemdelegate.h
+++ b/pcmanfm/desktopitemdelegate.h
@ -45,6 +45,9 @@ public:
  const QColor& shadowColor() const {
    return shadowColor_;
  }
+  void setMargins(QSize margins) {
+    margins_ = margins.expandedTo(QSize(0, 0));
+  }

 private:
  void drawText(QPainter* painter, QStyleOptionViewItemV4& opt, QRectF& textRect) const;
@ -53,6 +56,7 @@ private:
  QListView* view_;
  QIcon symlinkIcon_;
  QColor shadowColor_;
+  QSize margins_;
 };

 }
--- a/pcmanfm/desktoppreferencesdialog.cpp
+++ b/pcmanfm/desktoppreferencesdialog.cpp
@ -87,6 +87,10 @@ DesktopPreferencesDialog::DesktopPreferencesDialog(QWidget* parent, Qt::WindowFl

  connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked,
          this, &DesktopPreferencesDialog::onApplyClicked);
+
+  ui.hMargin->setValue(settings.desktopCellMargins().width());
+  ui.vMargin->setValue(settings.desktopCellMargins().height());
+  connect(ui.lockMargins, &QAbstractButton::clicked, this, &DesktopPreferencesDialog::lockMargins);
 }

 DesktopPreferencesDialog::~DesktopPreferencesDialog() {
@ -108,6 +112,16 @@ void DesktopPreferencesDialog::setupDesktopFolderUi()
    this, &DesktopPreferencesDialog::onBrowseDesktopFolderClicked);
 }

+void DesktopPreferencesDialog::lockMargins(bool lock) {
+  ui.vMargin->setDisabled(lock);
+  if(lock) {
+    ui.vMargin->setValue(ui.hMargin->value());
+    connect(ui.hMargin, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue);
+  }
+  else
+    disconnect(ui.hMargin, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue);
+}
+
 void DesktopPreferencesDialog::applySettings()
 {
  Settings& settings = static_cast<Application*>(qApp)->settings();
@ -123,6 +137,7 @@ void DesktopPreferencesDialog::applySettings()
  settings.setDesktopFgColor(ui.textColor->color());
  settings.setDesktopShadowColor(ui.shadowColor->color());
  settings.setShowWmMenu(ui.showWmMenu->isChecked());
+  settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));

  settings.save();
 }
--- a/pcmanfm/desktoppreferencesdialog.h
+++ b/pcmanfm/desktoppreferencesdialog.h
@ -47,6 +47,7 @@ protected Q_SLOTS:
  void onWallpaperModeChanged(int index);
  void onBrowseClicked();
  void onBrowseDesktopFolderClicked();
+  void lockMargins(bool lock);

  void applySettings();

--- a/pcmanfm/desktopwindow.cpp
+++ b/pcmanfm/desktopwindow.cpp
@ -344,7 +344,8 @@ void DesktopWindow::updateFromSettings(Settings& settings) {
  setWallpaperMode(settings.wallpaperMode());
  setFont(settings.desktopFont());
  setIconSize(Fm::FolderView::IconMode, QSize(settings.bigIconSize(), settings.bigIconSize()));
-  // setIconSize may trigger relayout of items by QListView, so we need to do the layout again.
+  setMargins(settings.desktopCellMargins());
+  // setIconSize and setMargins may trigger relayout of items by QListView, so we need to do the layout again.
  queueRelayout();
  setForeground(settings.desktopFgColor());
  setBackground(settings.desktopBgColor());
@ -441,8 +442,8 @@ void DesktopWindow::onIndexesMoved(const QModelIndexList& indexes) {
      workArea.adjust(12, 12, -12, -12);
      if(customItemPos_.keys(tl).isEmpty() // don't put items on each other
         && tl.x() >= workArea.x() && tl.y() >= workArea.y()
-         && tl.x() + listView_->gridSize().width() <= workArea.right()
-         && tl.y() + listView_->gridSize().height() <= workArea.bottom()) {
+         && tl.x() + listView_->gridSize().width() <= workArea.right() + 1 // for historical reasons (-> Qt doc)
+         && tl.y() + listView_->gridSize().height() <= workArea.bottom() + 1) { // as above
        QByteArray name = fm_file_info_get_name(file);
        customItemPos_[name] = tl;
        // qDebug() << "indexMoved:" << name << index << itemRect;
@ -453,6 +454,48 @@ void DesktopWindow::onIndexesMoved(const QModelIndexList& indexes) {
  queueRelayout();
 }

+void DesktopWindow::removeBottomGap() {
+  /************************************************************
+   NOTE: Desktop is an area bounded from below while icons snap
+   to its grid srarting from above. Therefore, we try to adjust
+   the vertical cell margin to prevent relatively large gaps
+   from taking shape at the desktop bottom.
+   ************************************************************/
+  QSize cellMargins = getMargins();
+  int workAreaHeight = qApp->desktop()->availableGeometry(screenNum_).height()
+                       - 24; // a 12-pix margin will be considered everywhere
+  int cellHeight = listView_->gridSize().height() + listView_->spacing();
+  int iconNumber = workAreaHeight / cellHeight;
+  int bottomGap = workAreaHeight % cellHeight;
+  /*******************************************
+   First try to make room for an extra icon...
+   *******************************************/
+  // If one pixel is subtracted from the vertical margin, cellHeight
+  // will decrease by 2 while bottomGap will increase by 2*iconNumber.
+  // So, we can add an icon to the bottom once this inequality holds:
+  // bottomGap + 2*n*iconNumber >= cellHeight - 2*n
+  // From here, we get our "subtrahend":
+  qreal exactNumber = ((qreal)cellHeight - (qreal)bottomGap)
+                      / (2.0 * (qreal)iconNumber + 2.0);
+  int subtrahend = (int)exactNumber + ((int)exactNumber == exactNumber ? 0 : 1);
+  Settings& settings = static_cast<Application*>(qApp)->settings();
+  int minCellHeight = settings.desktopCellMargins().height();
+  if(subtrahend > 0
+     && cellMargins.height() - subtrahend >= minCellHeight) {
+    cellMargins -= QSize(0, subtrahend);
+  }
+  /***************************************************
+   ... but if that can't be done, try to spread icons!
+   ***************************************************/
+  else
+    cellMargins += QSize(0, (bottomGap / iconNumber) / 2);
+  // set the new margins (if they're changed)
+  delegate_->setMargins(cellMargins);
+  setMargins(cellMargins);
+  // in case the text shadow is reset to (0,0,0,0)
+  setShadow(settings.desktopShadowColor());
+}
+
 // QListView does item layout in a very inflexible way, so let's do our custom layout again.
 // FIXME: this is very inefficient, but due to the design flaw of QListView, this is currently the only workaround.
 void DesktopWindow::relayoutItems() {
@ -513,13 +556,13 @@ void DesktopWindow::relayoutItems() {
      }
      // move to next cell in the column
      pos.setY(pos.y() + grid.height() + listView_->spacing());
-      if(pos.y() + grid.height() > workArea.bottom()) {
+      if(pos.y() + grid.height() > workArea.bottom() + 1) {
        // if the next position may exceed the bottom of work area, go to the top of next column
        pos.setX(pos.x() + grid.width() + listView_->spacing());
        pos.setY(workArea.top());

        // check if the new column exceeds the right margin of work area
-        if(pos.x() + grid.width() > workArea.right()) {
+        if(pos.x() + grid.width() > workArea.right() + 1) {
          if(desktop->isVirtualDesktop()) {
            // in virtual desktop mode, go to next screen
            ++screen;
@ -555,8 +598,8 @@ void DesktopWindow::loadItemPositions() {
    if(var.isValid()) {
      QPoint customPos = var.toPoint();
      if (customPos.x() >= workArea.x() && customPos.y() >= workArea.y()
-          && customPos.x() + listView_->gridSize().width() <= workArea.right()
-          && customPos.y() + listView_->gridSize().height() <= workArea.bottom())
+          && customPos.x() + listView_->gridSize().width() <= workArea.right() + 1
+          && customPos.y() + listView_->gridSize().height() <= workArea.bottom() + 1)
      {
        // correct positions that are't aligned to the grid
        qreal w = qAbs((qreal)customPos.x() - (qreal)workArea.x())
@ -567,7 +610,7 @@ void DesktopWindow::loadItemPositions() {
        customPos.setY(workArea.y() + qRound(h) * (grid.height() + listView_->spacing()));
        while(customItemPos_.values().contains(customPos)) {
          customPos.setY(customPos.y() + grid.height() + listView_->spacing());
-          if(customPos.y() + grid.height() > workArea.bottom()) {
+          if(customPos.y() + grid.height() > workArea.bottom() + 1) {
            customPos.setX(customPos.x() + grid.width() + listView_->spacing());
            customPos.setY(workArea.top());
          }
@ -625,6 +668,7 @@ void DesktopWindow::onStickToCurrentPos(bool toggled) {

 void DesktopWindow::queueRelayout(int delay) {
  // qDebug() << "queueRelayout";
+  removeBottomGap();
  if(!relayoutTimer_) {
    relayoutTimer_ = new QTimer();
    relayoutTimer_->setSingleShot(true);
--- a/pcmanfm/desktopwindow.h
+++ b/pcmanfm/desktopwindow.h
@ -113,6 +113,9 @@ protected Q_SLOTS:
  void onDeleteActivated();
  void onFilePropertiesActivated();

+private:
+  void removeBottomGap();
+
 private:
  Fm::ProxyFolderModel* proxyModel_;
  Fm::CachedFolderModel* model_;
--- a/pcmanfm/main-win.ui
+++ b/pcmanfm/main-win.ui
@ -92,6 +92,9 @@
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
+          <property name="toolTip">
+           <string>Focus with Ctrl+I</string>
+          </property>
         </widget>
        </item>
       </layout>
@ -167,6 +170,7 @@
    <addaction name="separator"/>
    <addaction name="menuSorting"/>
    <addaction name="actionFilter"/>
+    <addaction name="actionMenu_bar"/>
   </widget>
   <widget class="QMenu" name="menu_Editw">
    <property name="title">
@ -244,6 +248,8 @@
   <addaction name="actionGoUp"/>
   <addaction name="actionReload"/>
   <addaction name="actionGo"/>
+   <addaction name="separator"/>
+   <addaction name="actionMenu"/>
  </widget>
  <action name="actionGoUp">
   <property name="icon">
@ -636,6 +642,9 @@
   <property name="text">
    <string>&amp;Close Window</string>
   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
  </action>
  <action name="actionEdit_Bookmarks">
   <property name="text">
@ -699,6 +708,9 @@
   <property name="text">
    <string>&amp;Filter</string>
   </property>
+   <property name="shortcut">
+    <string>Ctrl+B</string>
+   </property>
  </action>
  <action name="actionCloseLeft">
   <property name="icon">
@ -723,6 +735,31 @@
    <string>Close &amp;other tabs</string>
   </property>
  </action>
+  <action name="actionMenu_bar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Menu bar</string>
+   </property>
+   <property name="toolTip">
+    <string>Menu bar</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+M</string>
+   </property>
+  </action>
+  <action name="actionMenu">
+   <property name="icon">
+    <iconset theme="application-menu"/>
+   </property>
+   <property name="text">
+    <string>Menu</string>
+   </property>
+   <property name="toolTip">
+    <string>Menu</string>
+   </property>
+  </action>
 </widget>
 <customwidgets>
  <customwidget>
--- a/pcmanfm/mainwindow.cpp
+++ b/pcmanfm/mainwindow.cpp
@ -85,6 +85,10 @@ MainWindow::MainWindow(FmPath* path):
  ui.tabBar->setElideMode(Qt::ElideRight);
  ui.tabBar->setExpanding(false);
  ui.tabBar->setMovable(true); // reorder the tabs by dragging
+  if(!settings.fullWidthTabBar()) {
+    ui.verticalLayout->removeWidget(ui.tabBar);
+    ui.verticalLayout_2->insertWidget(0, ui.tabBar);
+  }

 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
  // switch to the tab under the cursor during dnd.
@ -164,13 +168,44 @@ MainWindow::MainWindow(FmPath* path):
  group->addAction(ui.actionAscending);
  group->addAction(ui.actionDescending);

+  // Add menubar actions to the main window this is necessary so that actions
+  // shortcuts are still working when the menubar is hidden.
+  addActions(ui.menubar->actions());
+
+  // Show or hide the menu bar
+  QMenu *menu = new QMenu();
+  menu->addMenu(ui.menu_File);
+  menu->addMenu(ui.menu_Editw);
+  menu->addMenu(ui.menu_View);
+  menu->addMenu(ui.menu_Go);
+  menu->addMenu(ui.menu_Bookmarks);
+  menu->addMenu(ui.menu_Tool);
+  menu->addMenu(ui.menu_Help);
+  ui.actionMenu->setMenu(menu);
+  if(ui.actionMenu->icon().isNull())
+    ui.actionMenu->setIcon(QIcon::fromTheme("applications-system"));
+  QList<QToolButton *> list = ui.toolBar->findChildren<QToolButton *>();
+  if (!list.isEmpty())
+    list.at(list.count() - 1)->setPopupMode(QToolButton::InstantPopup);
+  Q_FOREACH(QAction *action, ui.toolBar->actions()) {
+    if(action->isSeparator())
+      action->setVisible(!settings.showMenuBar());
+  }
+  ui.actionMenu->setVisible(!settings.showMenuBar());
+  ui.menubar->setVisible(settings.showMenuBar());
+  ui.actionMenu_bar->setChecked(settings.showMenuBar());
+  connect(ui.actionMenu_bar, &QAction::triggered, this, &MainWindow::toggleMenuBar);
+
  // create shortcuts
  QShortcut* shortcut;
+  shortcut = new QShortcut(QKeySequence(Qt::Key_Escape), this);
+  connect(shortcut, &QShortcut::activated, this, &MainWindow::onResetFocus);
+
  shortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this);
-  connect(shortcut, &QShortcut::activated, pathEntry, static_cast<void (QWidget::*)()>(&Fm::PathEdit::setFocus));
+  connect(shortcut, &QShortcut::activated, this, &MainWindow::focusPathEntry);

  shortcut = new QShortcut(Qt::ALT + Qt::Key_D, this);
-  connect(shortcut, &QShortcut::activated, pathEntry, static_cast<void (QWidget::*)()>(&QWidget::setFocus));
+  connect(shortcut, &QShortcut::activated, this, &MainWindow::focusPathEntry);

  shortcut = new QShortcut(Qt::CTRL + Qt::Key_Tab, this);
  connect(shortcut, &QShortcut::activated, this, &MainWindow::onShortcutNextTab);
@ -202,6 +237,13 @@ MainWindow::MainWindow(FmPath* path):
  shortcut = new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Delete), this);
  connect(shortcut, &QShortcut::activated, this, &MainWindow::on_actionDelete_triggered);

+  shortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_I), this);
+  connect(shortcut, &QShortcut::activated, this, &MainWindow::focusFilterBar);
+
+  // in addition to F3, for convenience
+  shortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F), this);
+  connect(shortcut, &QShortcut::activated, ui.actionFindFiles, &QAction::trigger);
+
  if(QToolButton* clearButton = ui.filterBar->findChild<QToolButton*>()) {
    clearButton->setToolTip(tr("Clear text (Ctrl+K)"));
    shortcut = new QShortcut(Qt::CTRL + Qt::Key_K, this);
@ -237,7 +279,7 @@ void MainWindow::chdir(FmPath* path) {
 }

 // add a new tab
-void MainWindow::addTab(FmPath* path) {
+int MainWindow::addTab(FmPath* path) {
  Settings& settings = static_cast<Application*>(qApp)->settings();

  TabPage* newPage = new TabPage(path, this);
@ -255,6 +297,32 @@ void MainWindow::addTab(FmPath* path) {
  if(!settings.alwaysShowTabs()) {
    ui.tabBar->setVisible(ui.tabBar->count() > 1);
  }
+
+  return index;
+}
+
+void MainWindow::toggleMenuBar(bool checked) {
+  Settings& settings = static_cast<Application*>(qApp)->settings();
+  bool showMenuBar = !settings.showMenuBar();
+
+  if (!showMenuBar) {
+    if (QMessageBox::Cancel == QMessageBox::warning(this,
+          tr("Hide menu bar"),
+          tr("This will hide the menu bar completely, use Ctrl+M to show it again."),
+          QMessageBox::Ok | QMessageBox::Cancel)) {
+      ui.actionMenu_bar->setChecked(true);
+      return;
+    }
+  }
+
+  ui.menubar->setVisible(showMenuBar);
+  ui.actionMenu_bar->setChecked(showMenuBar);
+  Q_FOREACH(QAction *action, ui.toolBar->actions()) {
+    if(action->isSeparator())
+      action->setVisible(!showMenuBar);
+  }
+  ui.actionMenu->setVisible(!showMenuBar);
+  settings.setShowMenuBar(showMenuBar);
 }

 void MainWindow::onPathEntryReturnPressed() {
@ -309,7 +377,8 @@ void MainWindow::on_actionGo_triggered() {

 void MainWindow::on_actionNewTab_triggered() {
  FmPath* path = currentPage()->path();
-  addTab(path);
+  int index = addTab(path);
+  ui.tabBar->setCurrentIndex(index);
 }

 void MainWindow::on_actionNewWin_triggered() {
@ -418,6 +487,21 @@ void MainWindow::on_actionFolderFirst_triggered(bool checked) {

 void MainWindow::on_actionFilter_triggered(bool checked) {
  ui.filterBar->setVisible(checked);
+  if(checked)
+    ui.filterBar->setFocus();
+  else if(TabPage* tabPage = currentPage()) {
+    ui.filterBar->clear();
+    tabPage->folderView()->childView()->setFocus();
+    // clear filter string for all tabs
+    int n = ui.stackedWidget->count();
+    for(int i = 0; i < n; ++i) {
+      TabPage* page = static_cast<TabPage*>(ui.stackedWidget->widget(i));
+      if(!page->getFilterStr().isEmpty()) {
+        page->setFilterStr(QString());
+        page->applyFilter();
+      }
+    }
+  }
  static_cast<Application*>(qApp)->settings().setShowFilter(checked);
 }

@ -499,6 +583,12 @@ void MainWindow::onTabBarCloseRequested(int index) {
  closeTab(index);
 }

+void MainWindow::onResetFocus() {
+  if(TabPage* page = currentPage()) {
+    currentPage()->folderView()->childView()->setFocus();
+  }
+}
+
 void MainWindow::onTabBarTabMoved(int from, int to) {
  // a tab in the tab bar is moved by the user, so we have to move the
  //  corredponding tab page in the stacked widget to the new position, too.
@ -515,6 +605,13 @@ void MainWindow::onTabBarTabMoved(int from, int to) {
  }
 }

+void MainWindow::focusFilterBar() {
+  if(!ui.filterBar->isVisible())
+    ui.actionFilter->trigger();
+  else
+    ui.filterBar->setFocus();
+}
+
 void MainWindow::onFilterStringChanged(QString str) {
  if(TabPage* tabPage = currentPage()) {
    // appy filter only if needed (not if tab is changed)
@ -951,6 +1048,13 @@ void MainWindow::closeRightTabs() {
    closeTab(rightClickIndex + 1);
 }

+void MainWindow::focusPathEntry() {
+  if(pathEntry != nullptr) {
+    pathEntry->setFocus();
+    pathEntry->selectAll();
+  }
+}
+
 void MainWindow::updateFromSettings(Settings& settings) {
  // apply settings

@ -963,9 +1067,16 @@ void MainWindow::updateFromSettings(Settings& settings) {

  // tabs
  ui.tabBar->setTabsClosable(settings.showTabClose());
-
-  if(!settings.alwaysShowTabs()) {
-    ui.tabBar->setVisible(ui.tabBar->count() > 1);
+  ui.tabBar->setVisible(settings.alwaysShowTabs() || (ui.tabBar->count() > 1));
+  if(ui.verticalLayout->indexOf(ui.tabBar) > -1) {
+    if(!settings.fullWidthTabBar()) {
+      ui.verticalLayout->removeWidget(ui.tabBar);
+      ui.verticalLayout_2->insertWidget(0, ui.tabBar);
+    }
+  }
+  else if (ui.verticalLayout_2->indexOf(ui.tabBar) > -1 && settings.fullWidthTabBar()) {
+    ui.verticalLayout_2->removeWidget(ui.tabBar);
+    ui.verticalLayout->insertWidget(0, ui.tabBar);
  }

  // all tab pages
--- a/pcmanfm/mainwindow.h
+++ b/pcmanfm/mainwindow.h
@ -45,7 +45,7 @@ public:
  virtual ~MainWindow();

  void chdir(FmPath* path);
-  void addTab(FmPath* path);
+  int addTab(FmPath* path);

  TabPage* currentPage() {
    return reinterpret_cast<TabPage*>(ui.stackedWidget->currentWidget());
@ -120,6 +120,7 @@ protected Q_SLOTS:
  void onTabBarCurrentChanged(int index);
  void onTabBarTabMoved(int from, int to);

+  void focusFilterBar();
  void onFilterStringChanged(QString str);

  void onShortcutPrevTab();
@ -140,6 +141,7 @@ protected Q_SLOTS:
  void onSidePaneCreateNewFolderRequested(FmPath* path);
  void onSidePaneModeChanged(Fm::SidePane::Mode mode);
  void onSplitterMoved(int pos, int index);
+  void onResetFocus();

  void onBackForwardContextMenu(QPoint pos);

@ -150,6 +152,8 @@ protected Q_SLOTS:
    closeLeftTabs();
    closeRightTabs();
  }
+  void focusPathEntry();
+  void toggleMenuBar(bool checked);

 protected:
  // void changeEvent( QEvent * event);
--- a/pcmanfm/preferences.ui
+++ b/pcmanfm/preferences.ui
@ -291,22 +291,22 @@
           <property name="title">
            <string>User interface</string>
           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_8">
-            <item>
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0" colspan="6">
             <widget class="QCheckBox" name="siUnit">
              <property name="text">
               <string>Use SI decimal prefixes instead of IEC binary prefixes</string>
              </property>
             </widget>
            </item>
-            <item>
+            <item row="1" column="0" colspan="6">
             <widget class="QCheckBox" name="backupAsHidden">
              <property name="text">
               <string>Treat backup files as hidden</string>
              </property>
             </widget>
            </item>
-            <item>
+            <item row="2" column="0" colspan="6">
             <widget class="QCheckBox" name="showFullNames">
              <property name="enabled">
               <bool>false</bool>
@ -316,7 +316,7 @@
              </property>
             </widget>
            </item>
-            <item>
+            <item row="3" column="0" colspan="6">
             <widget class="QCheckBox" name="shadowHidden">
              <property name="enabled">
               <bool>false</bool>
@ -326,6 +326,89 @@
              </property>
             </widget>
            </item>
+            <item row="4" column="0">
+             <spacer name="verticalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>5</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="5" column="0">
+             <widget class="QLabel" name="label_15">
+              <property name="text">
+               <string>Minimum item margins in icon view:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QSpinBox" name="hMargin">
+              <property name="toolTip">
+               <string>3 px by default.</string>
+              </property>
+              <property name="suffix">
+               <string> px</string>
+              </property>
+              <property name="maximum">
+               <number>48</number>
+              </property>
+              <property name="value">
+               <number>3</number>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="2">
+             <widget class="QLabel" name="label_16">
+              <property name="text">
+               <string>x</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="3">
+             <widget class="QSpinBox" name="vMargin">
+              <property name="toolTip">
+               <string>3 px by default.
+A space is also reserved for 3 lines of text.</string>
+              </property>
+              <property name="suffix">
+               <string> px</string>
+              </property>
+              <property name="maximum">
+               <number>48</number>
+              </property>
+              <property name="value">
+               <number>3</number>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="4">
+             <widget class="QCheckBox" name="lockMargins">
+              <property name="text">
+               <string>Lock</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="5">
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>5</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
           </layout>
          </widget>
         </item>
@ -363,47 +446,58 @@
             </widget>
            </item>
            <item row="1" column="0" colspan="2">
+             <widget class="QCheckBox" name="fullWidthTabbar">
+              <property name="toolTip">
+               <string>If unchecked, the tab bar will be positioned only
+above the folder-view and not above the left pane.</string>
+              </property>
+              <property name="text">
+               <string>Fullwidth tab bar</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0" colspan="2">
             <widget class="QCheckBox" name="showTabClose">
              <property name="text">
               <string>Show 'Close' buttons on tabs	</string>
              </property>
             </widget>
            </item>
-            <item row="2" column="0" colspan="2">
+            <item row="3" column="0" colspan="2">
             <widget class="QCheckBox" name="rememberWindowSize">
              <property name="text">
               <string>Remember the size of the last closed window</string>
              </property>
             </widget>
            </item>
-            <item row="3" column="0">
+            <item row="4" column="0">
             <widget class="QLabel" name="label_12">
              <property name="text">
               <string>Default width of new windows:</string>
              </property>
             </widget>
            </item>
-            <item row="4" column="0">
+            <item row="4" column="1">
+             <widget class="QSpinBox" name="fixedWindowWidth">
+              <property name="maximum">
+               <number>32768</number>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
             <widget class="QLabel" name="label_13">
              <property name="text">
               <string>Default height of new windows:</string>
              </property>
             </widget>
            </item>
-            <item row="4" column="1">
+            <item row="5" column="1">
             <widget class="QSpinBox" name="fixedWindowHeight">
              <property name="maximum">
               <number>32768</number>
              </property>
             </widget>
            </item>
-            <item row="3" column="1">
-             <widget class="QSpinBox" name="fixedWindowWidth">
-              <property name="maximum">
-               <number>32768</number>
-              </property>
-             </widget>
-            </item>
           </layout>
          </widget>
         </item>
--- a/pcmanfm/preferencesdialog.cpp
+++ b/pcmanfm/preferencesdialog.cpp
@ -45,13 +45,7 @@ PreferencesDialog::PreferencesDialog (QString activePage, QWidget* parent):

  initFromSettings();

-  if(!activePage.isEmpty()) {
-    QWidget* page = findChild<QWidget*>(activePage + "Page");
-    if(page) {
-      int index = ui.stackedWidget->indexOf(page);
-      ui.listWidget->setCurrentRow(index);
-    }
-  }
+  selectPage(activePage);
  adjustSize();
 }

@ -118,6 +112,10 @@ void PreferencesDialog::initIconThemes(Settings& settings) {
    ui.iconThemeLabel->hide();
    ui.iconTheme->hide();
  }
+
+  ui.hMargin->setValue(settings.folderViewCellMargins().width());
+  ui.vMargin->setValue(settings.folderViewCellMargins().height());
+  connect(ui.lockMargins, &QAbstractButton::clicked, this, &PreferencesDialog::lockMargins);
 }

 void PreferencesDialog::initArchivers(Settings& settings) {
@ -172,6 +170,7 @@ void PreferencesDialog::initDisplayPage(Settings& settings) {

 void PreferencesDialog::initUiPage(Settings& settings) {
  ui.alwaysShowTabs->setChecked(settings.alwaysShowTabs());
+  ui.fullWidthTabbar->setChecked(settings.fullWidthTabBar());
  ui.showTabClose->setChecked(settings.showTabClose());
  ui.rememberWindowSize->setChecked(settings.rememberWindowSize());
  ui.fixedWindowWidth->setValue(settings.fixedWindowWidth());
@ -289,10 +288,12 @@ void PreferencesDialog::applyDisplayPage(Settings& settings) {
  settings.setBackupAsHidden(ui.backupAsHidden->isChecked());
  settings.setShowFullNames(ui.showFullNames->isChecked());
  settings.setShadowHidden(ui.shadowHidden->isChecked());
+  settings.setFolderViewCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
 }

 void PreferencesDialog::applyUiPage(Settings& settings) {
  settings.setAlwaysShowTabs(ui.alwaysShowTabs->isChecked());
+  settings.setFullWidthTabBar(ui.fullWidthTabbar->isChecked());
  settings.setShowTabClose(ui.showTabClose->isChecked());
  settings.setRememberWindowSize(ui.rememberWindowSize->isChecked());
  settings.setFixedWindowWidth(ui.fixedWindowWidth->value());
@ -362,4 +363,24 @@ void PreferencesDialog::accept() {
  QDialog::accept();
 }

+void PreferencesDialog::selectPage(QString name) {
+  if(!name.isEmpty()) {
+    QWidget* page = findChild<QWidget*>(name + "Page");
+    if(page) {
+      int index = ui.stackedWidget->indexOf(page);
+      ui.listWidget->setCurrentRow(index);
+    }
+  }
+}
+
+void PreferencesDialog::lockMargins(bool lock) {
+  ui.vMargin->setDisabled(lock);
+  if(lock) {
+    ui.vMargin->setValue(ui.hMargin->value());
+    connect(ui.hMargin, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue);
+  }
+  else
+    disconnect(ui.hMargin, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue);
+}
+
 } // namespace PCManFM
--- a/pcmanfm/preferencesdialog.h
+++ b/pcmanfm/preferencesdialog.h
@ -40,6 +40,11 @@ public:

  virtual void accept();

+  void selectPage(QString name);
+
+protected Q_SLOTS:
+  void lockMargins(bool lock);
+
 private:
  void initIconThemes(Settings& settings);
  void initArchivers(Settings& settings);
--- a/pcmanfm/settings.cpp
+++ b/pcmanfm/settings.cpp
@ -79,6 +79,8 @@ Settings::Settings():
  lastWindowMaximized_(false),
  splitterPos_(120),
  sidePaneMode_(Fm::SidePane::ModePlaces),
+  showMenuBar_(true),
+  fullWidthTabBar_(true),
  viewMode_(Fm::FolderView::IconMode),
  showHidden_(false),
  sortOrder_(Qt::AscendingOrder),
@ -96,10 +98,19 @@ Settings::Settings():
  showThumbnails_(true),
  archiver_(),
  siUnit_(false),
+  placesHome_(true),
+  placesDesktop_(true),
+  placesApplications_(true),
+  placesTrash_(true),
+  placesRoot_(true),
+  placesComputer_(true),
+  placesNetwork_(true),
  bigIconSize_(48),
  smallIconSize_(24),
  sidePaneIconSize_(24),
-  thumbnailIconSize_(128) {
+  thumbnailIconSize_(128),
+  folderViewCellMargins_(QSize(3, 3)),
+  desktopCellMargins_(QSize(3, 1)) {
 }

 Settings::~Settings() {
@ -154,7 +165,7 @@ bool Settings::loadFile(QString filePath) {
    // the value from XSETTINGS instead of hard code a fallback value.
    fallbackIconThemeName_ = "elementary"; // fallback icon theme name
  }
-  suCommand_ = settings.value("SuCommand", "gksu %s").toString();
+  suCommand_ = settings.value("SuCommand", "lxqt-sudo %s").toString();
  setTerminal(settings.value("Terminal", "xterm").toString());
  setArchiver(settings.value("Archiver", "file-roller").toString());
  setSiUnit(settings.value("SIUnit", false).toBool());
@ -194,6 +205,9 @@ bool Settings::loadFile(QString filePath) {

  desktopSortOrder_ = sortOrderFromString(settings.value("SortOrder").toString());
  desktopSortColumn_ = sortColumnFromString(settings.value("SortColumn").toString());
+
+  desktopCellMargins_ = (settings.value("DesktopCellMargins", QSize(3, 1)).toSize()
+                         .expandedTo(QSize(0, 0))).boundedTo(QSize(48, 48));
  settings.endGroup();

  settings.beginGroup("Volume");
@ -226,6 +240,19 @@ bool Settings::loadFile(QString filePath) {
  smallIconSize_ = settings.value("SmallIconSize", 24).toInt();
  sidePaneIconSize_ = settings.value("SidePaneIconSize", 24).toInt();
  thumbnailIconSize_ = settings.value("ThumbnailIconSize", 128).toInt();
+
+  folderViewCellMargins_ = (settings.value("FolderViewCellMargins", QSize(3, 3)).toSize()
+                            .expandedTo(QSize(0, 0))).boundedTo(QSize(48, 48));
+  settings.endGroup();
+
+  settings.beginGroup("Places");
+  placesHome_ = settings.value("PlacesHome", true).toBool();
+  placesDesktop_ = settings.value("PlacesDesktop", true).toBool();
+  placesApplications_ = settings.value("PlacesApplications", true).toBool();
+  placesTrash_ = settings.value("PlacesTrash", true).toBool();
+  placesRoot_ = settings.value("PlacesRoot", true).toBool();
+  placesComputer_ = settings.value("PlacesComputer", true).toBool();
+  placesNetwork_ = settings.value("PlacesNetwork", true).toBool();
  settings.endGroup();

  settings.beginGroup("Window");
@ -239,6 +266,8 @@ bool Settings::loadFile(QString filePath) {
  showTabClose_ = settings.value("ShowTabClose", true).toBool();
  splitterPos_ = settings.value("SplitterPos", 150).toInt();
  sidePaneMode_ = sidePaneModeFromString(settings.value("SidePaneMode").toString());
+  showMenuBar_ = settings.value("ShowMenuBar", true).toBool();
+  fullWidthTabBar_ = settings.value("FullWidthTabBar", true).toBool();
  settings.endGroup();

  return true;
@ -285,6 +314,7 @@ bool Settings::saveFile(QString filePath) {
  settings.setValue("ShowHidden", desktopShowHidden_);
  settings.setValue("SortOrder", sortOrderToString(desktopSortOrder_));
  settings.setValue("SortColumn", sortColumnToString(desktopSortColumn_));
+  settings.setValue("DesktopCellMargins", desktopCellMargins_);
  settings.endGroup();

  settings.beginGroup("Volume");
@ -317,6 +347,18 @@ bool Settings::saveFile(QString filePath) {
  settings.setValue("SmallIconSize", smallIconSize_);
  settings.setValue("SidePaneIconSize", sidePaneIconSize_);
  settings.setValue("ThumbnailIconSize", thumbnailIconSize_);
+
+  settings.setValue("FolderViewCellMargins", folderViewCellMargins_);
+  settings.endGroup();
+
+  settings.beginGroup("Places");
+  settings.setValue("PlacesHome", placesHome_);
+  settings.setValue("PlacesDesktop", placesDesktop_);
+  settings.setValue("PlacesApplications", placesApplications_);
+  settings.setValue("PlacesTrash", placesTrash_);
+  settings.setValue("PlacesRoot", placesRoot_);
+  settings.setValue("PlacesComputer", placesComputer_);
+  settings.setValue("PlacesNetwork", placesNetwork_);
  settings.endGroup();

  settings.beginGroup("Window");
@ -330,6 +372,8 @@ bool Settings::saveFile(QString filePath) {
  settings.setValue("ShowTabClose", showTabClose_);
  settings.setValue("SplitterPos", splitterPos_);
  settings.setValue("SidePaneMode", sidePaneModeToString(sidePaneMode_));
+  settings.setValue("ShowMenuBar", showMenuBar_);
+  settings.setValue("FullWidthTabBar", fullWidthTabBar_);
  settings.endGroup();
  return true;
 }
@ -517,4 +561,5 @@ void Settings::setTerminal(QString terminalCommand) {
    g_signal_emit_by_name(fm_config, "changed::terminal");
 }

+
 } // namespace PCManFM
--- a/pcmanfm/settings.h
+++ b/pcmanfm/settings.h
@ -306,6 +306,22 @@ public:
    sidePaneMode_ = sidePaneMode;
  }

+  bool showMenuBar() const {
+    return showMenuBar_;
+  }
+
+  void setShowMenuBar(bool showMenuBar) {
+    showMenuBar_ = showMenuBar;
+  }
+
+  bool fullWidthTabBar() const {
+    return fullWidthTabBar_;
+  }
+
+  void setFullWidthTabBar(bool fullWith) {
+    fullWidthTabBar_ = fullWith;
+  }
+
  Fm::FolderView::ViewMode viewMode() const {
    return viewMode_;
  }
@ -322,6 +338,63 @@ public:
    showHidden_ = showHidden;
  }

+  bool placesHome() const {
+      return placesHome_;
+  }
+
+  void setPlacesHome(bool placesHome) {
+      placesHome_ = placesHome;
+  }
+
+  bool placesDesktop() const {
+      return placesDesktop_;
+  }
+
+  void setPlacesDesktop(bool placesDesktop) {
+      placesDesktop_ = placesDesktop;
+  }
+
+  bool placesApplications() const {
+      return placesApplications_;
+  }
+
+  void setPlacesApplications(bool placesApplications) {
+      placesApplications_ = placesApplications;
+  }
+
+  bool placesTrash() const {
+      return placesTrash_;
+  }
+
+  void setPlacesTrash(bool placesTrash) {
+      placesTrash_ = placesTrash;
+  }
+
+  bool placesRoot() const {
+      return placesRoot_;
+  }
+
+  void setPlacesRoot(bool placesRoot) {
+      placesRoot_ = placesRoot;
+  }
+
+  bool placesComputer() const {
+      return placesComputer_;
+  }
+
+  void setPlacesComputer(bool placesComputer) {
+      placesComputer_ = placesComputer;
+  }
+
+  bool placesNetwork() const {
+      return placesNetwork_;
+  }
+
+  void setPlacesNetwork(bool placesNetwork) {
+      placesNetwork_ = placesNetwork;
+  }
+
+
  Qt::SortOrder sortOrder() const {
    return sortOrder_;
  }
@ -446,6 +519,23 @@ public:
    return thumbnailIconSize_;
  }

+  QSize folderViewCellMargins() const {
+    return folderViewCellMargins_;
+  }
+
+  void setFolderViewCellMargins(QSize size) {
+    folderViewCellMargins_ = size;
+  }
+
+  QSize desktopCellMargins() const {
+    return desktopCellMargins_;
+  }
+
+  void setDesktopCellMargins(QSize size) {
+    desktopCellMargins_ = size;
+  }
+
+
  bool showThumbnails() {
    return showThumbnails_;
  }
@ -536,6 +626,7 @@ public:
    fm_config->template_run_app = templateRunApp_;
  }

+
 private:
  QString profileName_;
  bool supportTrash_;
@ -574,6 +665,8 @@ private:
  bool lastWindowMaximized_;
  int splitterPos_;
  Fm::SidePane::Mode sidePaneMode_;
+  bool showMenuBar_;
+  bool fullWidthTabBar_;

  Fm::FolderView::ViewMode viewMode_;
  bool showHidden_;
@ -599,6 +692,14 @@ private:
  bool showFullNames_;
  bool shadowHidden_;

+  bool placesHome_;
+  bool placesDesktop_;
+  bool placesApplications_;
+  bool placesTrash_;
+  bool placesRoot_;
+  bool placesComputer_;
+  bool placesNetwork_;
+
  int bigIconSize_;
  int smallIconSize_;
  int sidePaneIconSize_;
@ -607,6 +708,9 @@ private:
  bool onlyUserTemplates_;
  bool templateTypeOnce_;
  bool templateRunApp_;
+
+  QSize folderViewCellMargins_;
+  QSize desktopCellMargins_;
 };

 }
--- a/pcmanfm/tabpage.cpp
+++ b/pcmanfm/tabpage.cpp
@ -85,6 +85,7 @@ TabPage::TabPage(FmPath* path, QWidget* parent):
  verticalLayout->setContentsMargins(0, 0, 0, 0);

  folderView_ = new View(settings.viewMode(), this);
+  folderView_->setMargins(settings.folderViewCellMargins());
  // newView->setColumnWidth(Fm::FolderModel::ColumnName, 200);
  connect(folderView_, &View::openDirRequested, this, &TabPage::onOpenDirRequested);
  connect(folderView_, &View::selChanged, this, &TabPage::onSelChanged);
--- a/pcmanfm/translations/pcmanfm-qt-desktop-pref_ru_RU.desktop
+++ b/pcmanfm/translations/pcmanfm-qt-desktop-pref_ru_RU.desktop
@ -1,4 +0,0 @@
-#Translations
-Name[ru_RU]=Рабочий стол
-GenericName[ru_RU]=Настройки рабочего стола
-Comment[ru_RU]=Изменить обои и поведение менеджера рабочего стола
--- a/pcmanfm/translations/pcmanfm-qt-desktop-pref_tr.desktop
+++ b/pcmanfm/translations/pcmanfm-qt-desktop-pref_tr.desktop
@ -0,0 +1,4 @@
+#Translations / translated by tulliana <tulliana@yandex.com>
+Name[tr]=Dosya Yöneticisi (pcmanfm-qt)
+GenericName[tr]=Dosya ve masaüstü yönetim uygulaması
+Comment[tr]=Dosya Yöneticisi ve Masaüstü Ayarları (duvarkağıtları, menüler vs..)
--- a/pcmanfm/translations/pcmanfm-qt_cs_CZ.ts
+++ b/pcmanfm/translations/pcmanfm-qt_cs_CZ.ts
@ -54,12 +54,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_about.h" line="142"/>
        <source>Authors</source>
-        <translation type="unfinished">Autoři</translation>
+        <translation>Autoři</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_about.h" line="160"/>
        <source>License</source>
-        <translation type="unfinished">Licence</translation>
+        <translation>Licence</translation>
    </message>
 </context>
 <context>
@ -203,7 +203,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_desktop-preferences.h" line="278"/>
        <source>Advanced</source>
-        <translation type="unfinished">Pokročilé</translation>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@ -245,7 +245,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="563"/>
        <source>&amp;Home</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Domů</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="565"/>
@ -290,7 +290,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="577"/>
        <source>&amp;Computer</source>
-        <translation type="unfinished">Počítač</translation>
+        <translation type="unfinished">P&amp;očítač</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="578"/>
@ -300,122 +300,122 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="579"/>
        <source>&amp;Network</source>
-        <translation type="unfinished">Síť</translation>
+        <translation type="unfinished">&amp;Síť</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="580"/>
        <source>&amp;Desktop</source>
-        <translation type="unfinished">Plocha</translation>
+        <translation type="unfinished">P&amp;locha</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="581"/>
        <source>&amp;Add to Bookmarks</source>
-        <translation type="unfinished">Přidat k záložkám</translation>
+        <translation type="unfinished">&amp;Přidat k záložkám</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="582"/>
        <source>&amp;Applications</source>
-        <translation type="unfinished">Programy</translation>
+        <translation type="unfinished">P&amp;rogramy</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="589"/>
        <source>Ctrl+X</source>
-        <translation type="unfinished">Ctrl+X</translation>
+        <translation>Ctrl+X</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="590"/>
        <source>&amp;Copy</source>
-        <translation type="unfinished">Kopírovat</translation>
+        <translation>&amp;Kopírovat</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="591"/>
        <source>Ctrl+C</source>
-        <translation type="unfinished">Ctrl+C</translation>
+        <translation>Ctrl+C</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="592"/>
        <source>&amp;Paste</source>
-        <translation type="unfinished">Vložit</translation>
+        <translation>&amp;Vložit</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="593"/>
        <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
+        <translation>Ctrl+V</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="594"/>
        <source>Select &amp;All</source>
-        <translation type="unfinished">Vybrat všechno</translation>
+        <translation>Vybr&amp;at všechno</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="596"/>
        <source>Pr&amp;eferences</source>
-        <translation type="unfinished">&amp;Nastavení</translation>
+        <translation>&amp;Předvolby</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="597"/>
        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vzestupně</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="598"/>
        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sesupně</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="599"/>
        <source>&amp;By File Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Podle &amp;jména</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="600"/>
        <source>By &amp;Modification Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Podle č&amp;asu</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="601"/>
        <source>By File &amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Podle &amp;typu</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="602"/>
        <source>By &amp;Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Podle v&amp;lastníka</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="603"/>
        <source>&amp;Folder First</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Adresáře jako pvní</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="619"/>
        <source>&amp;Invert Selection</source>
-        <translation type="unfinished">Invertovat výběr</translation>
+        <translation>&amp;Invertovat výběr</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="620"/>
        <source>&amp;Delete</source>
-        <translation type="unfinished">Smazat</translation>
+        <translation>&amp;Smazat</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="622"/>
        <source>&amp;Rename</source>
-        <translation type="unfinished">Přejmenovat</translation>
+        <translation>Pře&amp;jmenovat</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="629"/>
        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zohlednit velikost písmen</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="630"/>
        <source>By File &amp;Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Podle v&amp;elikosti</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="631"/>
        <source>&amp;Close Window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Zavřít okno</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="595"/>
@ -425,7 +425,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="558"/>
        <source>Go &amp;Up</source>
-        <translation type="unfinished">Nahoru</translation>
+        <translation type="unfinished">&amp;Nahoru</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="570"/>
@ -435,27 +435,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="584"/>
        <source>&amp;Icon View</source>
-        <translation type="unfinished">Pohled s ikonami</translation>
+        <translation>&amp;Ikony</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="585"/>
        <source>&amp;Compact View</source>
-        <translation type="unfinished">Kompaktní pohled</translation>
+        <translation>&amp;Kompaktní</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="586"/>
        <source>&amp;Detailed List</source>
-        <translation type="unfinished">Seznam s podrobnostmi</translation>
+        <translation>&amp;Podrobnosti</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="587"/>
        <source>&amp;Thumbnail View</source>
-        <translation type="unfinished">Pohled s náhledy</translation>
+        <translation>&amp;Náhledy</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="588"/>
        <source>Cu&amp;t</source>
-        <translation type="unfinished">Vyjmout</translation>
+        <translation>V&amp;yjmout</translation>
    </message>
    <message>
        <source>Ascending</source>
@ -503,7 +503,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="609"/>
        <source>Go &amp;Back</source>
-        <translation type="unfinished">Zpět</translation>
+        <translation type="unfinished">&amp;Zpět</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="611"/>
@ -558,27 +558,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="638"/>
        <source>Ctrl+Shift+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+N</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="640"/>
        <source>Ctrl+Alt+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+N</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="643"/>
        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrovat</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="646"/>
        <source>C&amp;reate New</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit &amp;nový</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="649"/>
        <source>&amp;Sorting</source>
-        <translation type="unfinished">Řadit</translation>
+        <translation type="unfinished">Ř&amp;adit</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="654"/>
@ -630,32 +630,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="636"/>
        <source>&amp;Edit Bookmarks</source>
-        <translation type="unfinished">Upravit záložky</translation>
+        <translation type="unfinished">&amp;Upravit záložky</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="637"/>
        <source>&amp;Folder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Složku</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="639"/>
        <source>&amp;Blank File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Prázdný soubor</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="641"/>
        <source>&amp;Find Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Najít soubory</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="642"/>
        <source>F3</source>
-        <translation type="unfinished"></translation>
+        <translation>F3</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="644"/>
        <source>Filter by string...</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrovat podle řetězce...</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="645"/>
@ -872,7 +872,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../mainwindow.cpp" line="907"/>
        <source>&amp;Delete</source>
-        <translation type="unfinished">Smazat</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="969"/>
@ -968,168 +968,168 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="706"/>
        <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Předvolby</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="715"/>
        <source>User Interface</source>
-        <translation type="unfinished">Uživatelské rozhraní</translation>
+        <translation>Uživatelské rozhraní</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="711"/>
        <source>Behavior</source>
-        <translation type="unfinished">Chování</translation>
+        <translation>Chování</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="717"/>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="779"/>
        <source>Thumbnail</source>
-        <translation type="unfinished">Náhled</translation>
+        <translation>Náhled</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="719"/>
        <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Úložiště</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="721"/>
        <source>Advanced</source>
-        <translation type="unfinished">Pokročilé</translation>
+        <translation>Pokročilé</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="742"/>
        <source>Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikony</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="744"/>
        <source>Size of big icons:</source>
-        <translation type="unfinished">Velikost velkých ikon:</translation>
+        <translation>Velikost velkých ikon:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="745"/>
        <source>Size of small icons:</source>
-        <translation type="unfinished">Velikost malých ikon:</translation>
+        <translation>Velikost malých ikon:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="746"/>
        <source>Size of thumbnails:</source>
-        <translation type="unfinished">Velikost náhledů:</translation>
+        <translation>Velikost náhledů:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="747"/>
        <source>Size of side pane icons:</source>
-        <translation type="unfinished">Velikost ikon v postranním panelu:</translation>
+        <translation>Velikost ikon v postranním panelu:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="743"/>
        <source>Icon theme:</source>
-        <translation type="unfinished"></translation>
+        <translation>Téma ikon:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="753"/>
        <source>Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Okno</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="757"/>
        <source>Default width of new windows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Výchozí šířka nových oken:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="758"/>
        <source>Default height of new windows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Výchozí výška nových oken:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="754"/>
        <source>Always show the tab bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Vždycky zobrazovat lištu s panely</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="755"/>
        <source>Show &apos;Close&apos; buttons on tabs	</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobrazovat tlačítko &apos;Zavřít&apos; na panelech	</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="756"/>
        <source>Remember the size of the last closed window</source>
-        <translation type="unfinished"></translation>
+        <translation>Pamatovat si rozměry naposedy zavřeného okna</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="724"/>
        <source>Browsing</source>
-        <translation type="unfinished"></translation>
+        <translation>Prohlížení</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="725"/>
        <source>Open files with single click</source>
-        <translation type="unfinished"></translation>
+        <translation>Otvírat soubory jedním kliknutím</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="726"/>
        <source>Delay of auto-selection in single click mode (0 to disable)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zpoždění automatického výběru v jednoklikacím režimu (0 pro zákaz)</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="727"/>
        <source>Default view mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Výchozí režim pohledu:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="728"/>
        <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation> s</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="736"/>
        <source>File Operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Operace se soubory</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="737"/>
        <source>Confirm before deleting files</source>
-        <translation type="unfinished"></translation>
+        <translation>Potvrdit mazání souborů</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="738"/>
        <source>Move deleted files to &quot;trash bin&quot; instead of erasing from disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Přesunout mazané soubory do koše místo smazání z disku.</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="783"/>
        <source>Show thumbnails of files</source>
-        <translation type="unfinished">Zobrazovat náhledy souborů</translation>
+        <translation>Zobrazovat náhledy souborů</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="782"/>
        <source>Only show thumbnails for local files</source>
-        <translation type="unfinished">Zobrazovat náhlet jen u lokálních souborů</translation>
+        <translation>Zobrazovat náhled jen u lokálních souborů</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="713"/>
        <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobrazení</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="729"/>
        <source>Bookmarks:</source>
-        <translation type="unfinished"></translation>
+        <translation>Záložky:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="732"/>
        <source>Open in current tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Otvírat v současném panelu</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="733"/>
        <source>Open in new tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Otvírat v novém panelu</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="734"/>
        <source>Open in new window</source>
-        <translation type="unfinished"></translation>
+        <translation>Otvírat v novém okně</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="739"/>
@ -1149,7 +1149,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="748"/>
        <source>User interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Uživatelské rozhraní</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="750"/>
@ -1209,12 +1209,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="780"/>
        <source>Do not generate thumbnails for image files exceeding this size:</source>
-        <translation type="unfinished">Negenerovat náhledy obrázků přesahujících tuto velikost:</translation>
+        <translation>Negenerovat náhledy obrázků přesahujících tuto velikost:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="781"/>
        <source> KB</source>
-        <translation type="unfinished"></translation>
+        <translation> KB</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="784"/>
@ -1224,42 +1224,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="785"/>
        <source>Mount mountable volumes automatically on program startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Připojit přenosná úložiště automaticky při startu programu</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="786"/>
        <source>Mount removable media automatically when they are inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Připojit přenosná úložiště automaticky když jsou vložena</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="787"/>
        <source>Show available options for removable media when they are inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobrazit pokročilé volby pro přenosná úložiště když jsou vložena</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="788"/>
        <source>When removable medium unmounted:</source>
-        <translation type="unfinished"></translation>
+        <translation>Když je přenosné úložiště odpojeno:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="789"/>
        <source>Close &amp;tab containing removable medium</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zavřít panel obsahující přenosné úložiště</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="790"/>
        <source>Chan&amp;ge folder in the tab to home folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Změnit adresář v panelu na &amp;domovský</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="793"/>
        <source>Switch &amp;user command:</source>
-        <translation type="unfinished"></translation>
+        <translation>Příkaz k přepnutí &amp;uživatele:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="796"/>
        <source>Archiver in&amp;tegration:</source>
-        <translation type="unfinished"></translation>
+        <translation>Propojení s &amp;archivátorem:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="797"/>
@ -1284,18 +1284,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="791"/>
        <source>Programs</source>
-        <translation type="unfinished"></translation>
+        <translation>Programy</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="792"/>
        <source>Terminal emulator:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emulátor terminálu:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="794"/>
        <source>Examples: &quot;xterm -e %s&quot; for terminal or &quot;gksu %s&quot; for switching user.
 %s = the command line you want to execute with terminal or su.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Příklady: &quot;xterm -e %s&quot; pro terminál nebo &quot;gksu %s&quot; pro přepnutí uživatele.
+%s = příkazový řádek, který chceš spustit terminálem nebo su.</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="749"/>
--- a/pcmanfm/translations/pcmanfm-qt_el.ts
+++ b/pcmanfm/translations/pcmanfm-qt_el.ts
@ -910,7 +910,7 @@ USA.</translation>
    <message>
        <location filename="../application.cpp" line="190"/>
        <source>Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)</source>
-        <translation>Ορισμός της λειτουργίας της επιφάνειας ΛΕΙΤΟΥΡΓΙΑ=(χρώμα|τέντωμα|προσαρμογή|κέντρο|παράθεση)</translation>
+        <translation>Ορισμός της λειτουργίας της επιφάνειας ΛΕΙΤΟΥΡΓΙΑ=(color|stretch|fit|center|tile)</translation>
    </message>
    <message>
        <location filename="../application.cpp" line="190"/>
--- a/pcmanfm/translations/pcmanfm-qt_es.ts
+++ b/pcmanfm/translations/pcmanfm-qt_es.ts
@ -888,7 +888,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <message>
        <location filename="../application.cpp" line="190"/>
        <source>Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)</source>
-        <translation>Definir modo de papel tapiz. MODO =(color|estirar|ajustar|centrar|repetir)</translation>
+        <translation>Definir modo de papel tapiz. MODO =(color|stretch|fit|center|tile)</translation>
    </message>
    <message>
        <location filename="../application.cpp" line="190"/>
--- a/pcmanfm/translations/pcmanfm-qt_fr.ts
+++ b/pcmanfm/translations/pcmanfm-qt_fr.ts
@ -716,7 +716,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</translation>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="648"/>
        <source>&amp;View</source>
-        <translation>&amp;Voir</translation>
+        <translation>&amp;Affichage</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="650"/>
@ -795,7 +795,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</translation>
    <message>
        <location filename="../application.cpp" line="190"/>
        <source>Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)</source>
-        <translation>Définir le mode de fond d&apos;écran de bureau. MODE=(couleur|étirer|ajuster|centrer|découper)</translation>
+        <translation>Définir le mode de fond d&apos;écran de bureau. MODE=(color|stretch|fit|center|tile)</translation>
    </message>
    <message>
        <location filename="../application.cpp" line="190"/>
@ -942,7 +942,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</translation>
    <message>
        <location filename="../preferencesdialog.cpp" line="191"/>
        <source>Compact Icon View</source>
-        <translation>Vue en icônes compacte</translation>
+        <translation>Vue compacte</translation>
    </message>
    <message>
        <location filename="../preferencesdialog.cpp" line="192"/>
@ -1118,7 +1118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</translation>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="727"/>
        <source>Default view mode:</source>
-        <translation>Mode de vue par défaut :</translation>
+        <translation>Mode d&apos;affichage par défaut :</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="728"/>
@ -1153,7 +1153,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</translation>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="713"/>
        <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Affichage</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="729"/>
--- a/pcmanfm/translations/pcmanfm-qt_it.ts
+++ b/pcmanfm/translations/pcmanfm-qt_it.ts
@ -1142,7 +1142,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="713"/>
        <source>Display</source>
-        <translation>Schermo</translation>
+        <translation>Visualizza</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="729"/>
--- a/pcmanfm/translations/pcmanfm-qt_pl.ts
+++ b/pcmanfm/translations/pcmanfm-qt_pl.ts
@ -102,27 +102,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_desktop-folder.h" line="76"/>
        <source>Desktop</source>
-        <translation type="unfinished">Pulpit</translation>
+        <translation>Pulpit</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_desktop-folder.h" line="77"/>
        <source>Desktop folder:</source>
-        <translation type="unfinished">Katalog Pulpitu:</translation>
+        <translation>Katalog Pulpitu:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_desktop-folder.h" line="79"/>
        <source>Image file</source>
-        <translation type="unfinished">Plik obrazka</translation>
+        <translation>Plik obrazka</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_desktop-folder.h" line="84"/>
        <source>Folder path</source>
-        <translation type="unfinished">Ścieżka katalogu</translation>
+        <translation>Ścieżka katalogu</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_desktop-folder.h" line="85"/>
        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;Wybierz</translation>
+        <translation>&amp;Wybierz</translation>
    </message>
 </context>
 <context>
@ -370,7 +370,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="563"/>
        <source>&amp;Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Katalog &amp;użytkownika</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="565"/>
@ -480,37 +480,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="597"/>
        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rosnąco</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="598"/>
        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Malejąco</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="599"/>
        <source>&amp;By File Name</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nazwa</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="600"/>
        <source>By &amp;Modification Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Data &amp;modyfikacji</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="601"/>
        <source>By File &amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Typ pliku</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="602"/>
        <source>By &amp;Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>W&amp;łaściciel</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="603"/>
        <source>&amp;Folder First</source>
-        <translation type="unfinished"></translation>
+        <translation>Najpierw &amp;katalogi</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="619"/>
@ -530,17 +530,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="629"/>
        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Uwzględniaj wielkość &amp;liter</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="630"/>
        <source>By File &amp;Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Według &amp;rozmiaru</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="631"/>
        <source>&amp;Close Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zamknij okno</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="595"/>
@ -706,7 +706,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="649"/>
        <source>&amp;Sorting</source>
-        <translation>&amp;Sortowanie</translation>
+        <translation>&amp;Uszereguj według</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="654"/>
@ -763,32 +763,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="637"/>
        <source>&amp;Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Katalog</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="639"/>
        <source>&amp;Blank File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pusty plik</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="641"/>
        <source>&amp;Find Files</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Znajdź pliki</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="642"/>
        <source>F3</source>
-        <translation type="unfinished">F3</translation>
+        <translation>F3</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="643"/>
        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtruj</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="644"/>
        <source>Filter by string...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz część nazwy pliku...</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_main-win.h" line="645"/>
@ -877,7 +877,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../application.cpp" line="183"/>
        <source>Open Find Files utility</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz narzędzie wyszukiwania</translation>
    </message>
    <message>
        <location filename="../application.cpp" line="186"/>
@ -990,7 +990,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../mainwindow.cpp" line="190"/>
        <source>Clear text (Ctrl+K)</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń tekst (Ctrl+K)</translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="455"/>
@ -1242,7 +1242,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="713"/>
        <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Wygląd</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="729"/>
@ -1267,7 +1267,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="739"/>
        <source>Erase files on removable media instead of &quot;trash can&quot; creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuwaj pliki na urządzeniach wymiennych zamiast przenosić je do kosza</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="740"/>
@ -1277,7 +1277,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="741"/>
        <source>Don&apos;t ask options on launch executable file</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie pytaj o parametry przy uruchamianiu plików wykonywalnych</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="748"/>
@ -1287,7 +1287,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="750"/>
        <source>Treat backup files as hidden</source>
-        <translation type="unfinished"></translation>
+        <translation>Traktuj pliki kopii zapasowych jako ukryte</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="751"/>
@ -1297,12 +1297,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="752"/>
        <source>Show icons of hidden files shadowed</source>
-        <translation type="unfinished"></translation>
+        <translation>Przytłumione ikony dla plików ukrytych</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="759"/>
        <source>Show in places</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż w położeniach</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="764"/>
@ -1377,22 +1377,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="789"/>
        <source>Close &amp;tab containing removable medium</source>
-        <translation>Zamknij zakładkę nośnika wymiennego</translation>
+        <translation>Zamknij &amp;kartę nośnika wymiennego</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="790"/>
        <source>Chan&amp;ge folder in the tab to home folder</source>
-        <translation>Zmień katalog w zakładce na katalog użytkownika</translation>
+        <translation>Z&amp;mień katalog w karcie na katalog użytkownika</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="793"/>
        <source>Switch &amp;user command:</source>
-        <translation type="unfinished"></translation>
+        <translation>Polecenie przełączania &amp;użytkownika:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="796"/>
        <source>Archiver in&amp;tegration:</source>
-        <translation>Menedżer archiwów</translation>
+        <translation>Menedżer &amp;archiwów:</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="797"/>
@ -1402,7 +1402,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="798"/>
        <source>Show only user defined templates in menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazuj w menu tylko szablony zdefiniowane przez użytkownika</translation>
    </message>
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="799"/>
@ -1412,7 +1412,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
    <message>
        <location filename="../../build/pcmanfm/ui_preferences.h" line="800"/>
        <source>Run default application after creation from template</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchom domyślną aplikację po utworzeniu pliku z szablonu</translation>
    </message>
    <message>
        <source>Close tab containing removable medium</source>
--- a/pcmanfm/translations/pcmanfm-qt_ru.ts
+++ b/pcmanfm/translations/pcmanfm-qt_ru.ts
@ -115,7 +115,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../desktop-folder.ui" line="14"/>
        <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
    </message>
    <message>
        <location filename="../desktop-folder.ui" line="23"/>
@ -215,18 +215,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
        <source>Window Manager</source>
        <translation>Оконный менеджер</translation>
    </message>
-    <message>
-        <source>Desktop</source>
-        <translation type="vanished">Рабочий стол</translation>
-    </message>
-    <message>
-        <source>Desktop folder:</source>
-        <translation type="vanished">Папка рабочего стола:</translation>
-    </message>
-    <message>
-        <source>Folder path</source>
-        <translation type="vanished">Путь к папке</translation>
-    </message>
    <message>
        <location filename="../desktop-preferences.ui" line="220"/>
        <source>Advanced</source>
@ -235,7 +223,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../desktop-preferences.ui" line="232"/>
        <source>Show menus provided by window managers when desktop is clicked</source>
-        <translation>Показывать меню, предоставляемые оконными менеджерами по клику на рабочий стол</translation>
+        <translation>Показывать меню, предоставляемые оконными менеджерами, по клику на рабочий стол</translation>
    </message>
 </context>
 <context>
@ -243,7 +231,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../file-search.ui" line="14"/>
        <source>Find Files</source>
-        <translation>Найnb файлы</translation>
+        <translation>Найти файлы</translation>
    </message>
    <message>
        <location filename="../file-search.ui" line="24"/>
@ -264,7 +252,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
        <location filename="../file-search.ui" line="46"/>
        <location filename="../file-search.ui" line="221"/>
        <source>Case insensitive</source>
-        <translation>Регистрочувствительный</translation>
+        <translation>Нечувствительный к регистру</translation>
    </message>
    <message>
        <location filename="../file-search.ui" line="53"/>
@ -341,7 +329,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../file-search.ui" line="212"/>
        <source>File contains</source>
-        <translation>Содержание файла</translation>
+        <translation>Файл содержит</translation>
    </message>
    <message>
        <location filename="../file-search.ui" line="252"/>
@ -356,12 +344,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../file-search.ui" line="264"/>
        <source>Bigger than:</source>
-        <translation>Больше чем:</translation>
+        <translation>Больше, чем:</translation>
    </message>
    <message>
        <location filename="../file-search.ui" line="289"/>
        <source>Smaller than:</source>
-        <translation>Меньше чем:</translation>
+        <translation>Меньше, чем:</translation>
    </message>
    <message>
        <location filename="../file-search.ui" line="317"/>
@ -371,12 +359,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../file-search.ui" line="323"/>
        <source>Earlier than:</source>
-        <translation>Раньше чем:</translation>
+        <translation>Раньше, чем:</translation>
    </message>
    <message>
        <location filename="../file-search.ui" line="340"/>
        <source>Later than:</source>
-        <translation>Позже чем:</translation>
+        <translation>Позже, чем:</translation>
    </message>
 </context>
 <context>
@ -414,7 +402,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="119"/>
        <source>C&amp;reate New</source>
-        <translation>С&amp;оздать новое</translation>
+        <translation>&amp;Создать</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="137"/>
@ -459,7 +447,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="256"/>
        <source>Go &amp;Up</source>
-        <translation>Перейти &amp;вверх</translation>
+        <translation>Перейти вв&amp;ерх</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="259"/>
@ -509,7 +497,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="328"/>
        <source>&amp;New Window</source>
-        <translation>&amp;Новое окно</translation>
+        <translation>Новое &amp;окно</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="331"/>
@ -669,7 +657,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="643"/>
        <source>&amp;Case Sensitive</source>
-        <translation>&amp;Регистрочувствительная</translation>
+        <translation>&amp;Чувствительная к регистру</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="651"/>
@ -704,17 +692,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="729"/>
        <source>Close &amp;left tabs</source>
-        <translation>Закрыть вкладки &amp;слева</translation>
+        <translation>Закрыть вкладки с&amp;лева</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="737"/>
        <source>Close &amp;right tabs</source>
-        <translation>Закрыть вкладки &amp;справа</translation>
+        <translation>Закрыть вкладки с&amp;права</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="742"/>
        <source>Close &amp;other tabs</source>
-        <translation>Закрыть &amp;другие</translation>
+        <translation>Закрыть &amp;остальные вкладки</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="550"/>
@ -799,7 +787,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="627"/>
        <source>File &amp;Properties</source>
-        <translation>&amp;Свойства файла</translation>
+        <translation>Свойства &amp;файла</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="630"/>
@ -809,7 +797,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../main-win.ui" line="635"/>
        <source>&amp;Folder Properties</source>
-        <translation>&amp;Свойства папки</translation>
+        <translation>Свойства &amp;папки</translation>
    </message>
    <message>
        <location filename="../main-win.ui" line="661"/>
@ -893,7 +881,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../application.cpp" line="193"/>
        <source>Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)</source>
-        <translation>Выбрать режим обоев рабочего стола. РЕЖИМ=(цвет|растянуть|вместить|по центру|черепицей)</translation>
+        <translation>Выбрать режим обоев рабочего стола. РЕЖИМ=(color|stretch|fit|center|tile)</translation>
    </message>
    <message>
        <location filename="../application.cpp" line="193"/>
@ -1158,7 +1146,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="269"/>
        <source>Size of thumbnails:</source>
-        <translation>Размер значков:</translation>
+        <translation>Размер эскизов:</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="279"/>
@ -1238,7 +1226,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="172"/>
        <source>Move deleted files to &quot;trash bin&quot; instead of erasing from disk.</source>
-        <translation>Перемещать удалённые файлы в корзину вместо удаления их с диска.</translation>
+        <translation>Перемещать удалённые файлы в «корзину» вместо удаления их с диска.</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="554"/>
@ -1278,12 +1266,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="179"/>
        <source>Erase files on removable media instead of &quot;trash can&quot; creation</source>
-        <translation>Удалять файлы на съёмных носителях вместо создания «Корзины»</translation>
+        <translation>Удалять файлы на съёмных носителях вместо создания «корзины»</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="186"/>
        <source>Confirm before moving files into &quot;trash can&quot;</source>
-        <translation>Просить подтверждения перед удалением файлов в «Корзину»</translation>
+        <translation>Подтверждение перед перемещением файлов в «корзину»</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="193"/>
@ -1318,7 +1306,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="420"/>
        <source>Home</source>
-        <translation>Домой</translation>
+        <translation>Дом</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="433"/>
@ -1373,7 +1361,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="594"/>
        <source>Mount removable media automatically when they are inserted</source>
-        <translation>Подключать съёмные тома автоматически при их подключении</translation>
+        <translation>Подключать съёмные тома автоматически при их вставлении</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="601"/>
@ -1413,7 +1401,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="720"/>
        <source>Show only user defined templates in menu</source>
-        <translation>Показывать только шаблоны, определённые пользователем, в меню</translation>
+        <translation>Показывать в меню только шаблоны, определённые пользователем</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="727"/>
@ -1423,7 +1411,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA  02110-1301,
    <message>
        <location filename="../preferences.ui" line="734"/>
        <source>Run default application after creation from template</source>
-        <translation>Запускать приложение по умолчанию после создания шаблона</translation>
+        <translation>Запускать приложение по умолчанию после создания из шаблона</translation>
    </message>
    <message>
        <location filename="../preferences.ui" line="651"/>
--- a/pcmanfm/translations/pcmanfm-qt_ru_RU.desktop
+++ b/pcmanfm/translations/pcmanfm-qt_ru_RU.desktop
@ -1,4 +0,0 @@
-#Translations
-Name[ru_RU]=Диспетчер файлов PCManFM
-GenericName[ru_RU]=Диспетчер файлов
-Comment[ru_RU]=Просматривайте файловую систему и управляйте файлами
--- a/pcmanfm/translations/pcmanfm-qt_ru_RU.ts
+++ b/pcmanfm/translations/pcmanfm-qt_ru_RU.ts
--- a/pcmanfm/translations/pcmanfm-qt_tr.desktop
+++ b/pcmanfm/translations/pcmanfm-qt_tr.desktop
@ -0,0 +1,4 @@
+#Translations / translated by tulliana <tulliana@yandex.com>
+Name[tr]=PCManFM-Qt
+GenericName[tr]=Dosya Yönetici
+Comment[tr]=Lxqt dosya ve masaüstü yöneticisi
--- a/pcmanfm/translations/pcmanfm-qt_tr_TR.ts
+++ b/pcmanfm/translations/pcmanfm-qt_tr_TR.ts
--- a/pcmanfm/view.cpp
+++ b/pcmanfm/view.cpp
@ -118,8 +118,10 @@ void View::prepareFileMenu(Fm::FileMenu* menu) {
    }
  }
  else {
-    menu->pasteAction()->setVisible(false);
-    menu->createAction()->setVisible(false);
+    if(menu->pasteAction()) // NULL for trash
+      menu->pasteAction()->setVisible(false);
+    if(menu->createAction())
+      menu->createAction()->setVisible(false);
  }
 }

@ -133,6 +135,8 @@ void View::updateFromSettings(Settings& settings) {
  setIconSize(Fm::FolderView::ThumbnailMode, QSize(settings.thumbnailIconSize(), settings.thumbnailIconSize()));
  setIconSize(Fm::FolderView::DetailedListMode, QSize(settings.smallIconSize(), settings.smallIconSize()));

+  setMargins(settings.folderViewCellMargins());
+
  setAutoSelectionDelay(settings.autoSelectionDelay());

  Fm::ProxyFolderModel* proxyModel = model();
--- a/pcmanfm/view.h
+++ b/pcmanfm/view.h
@ -41,6 +41,13 @@ public:

  void updateFromSettings(Settings& settings);

+  QSize  getMargins() const {
+    return Fm::FolderView::getMargins();
+  }
+  void setMargins(QSize size) {
+    Fm::FolderView::setMargins(size);
+  }
+
 Q_SIGNALS:
  void openDirRequested(FmPath* path, int target);