diff --git a/AUTHORS b/AUTHORS index b5b60c5..83cd2cd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,4 +3,4 @@ Upstream Authors: Hong Jen Yee (PCMan) Copyright: - Copyright (c) 2013-2015 LXQt team + Copyright (c) 2013-2016 LXQt team diff --git a/CMakeLists.txt b/CMakeLists.txt index f963be2..4200cb6 100644 --- 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}) diff --git a/README.md b/README.md index c9cd394..207fdfe 100644 --- 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 diff --git a/cmake/LXQtTranslateDesktop.cmake b/cmake/LXQtTranslateDesktop.cmake index 522ed68..80e95d4 100644 --- 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() diff --git a/debian/changelog b/debian/changelog index dd1e60a..f42aa4f 100644 --- 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 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 Mon, 28 Mar 2016 18:12:27 +0200 + pcmanfm-qt (0.10.1-2) unstable; urgency=medium * Bump Standards to 3.9.7 diff --git a/debian/control b/debian/control index ed12fc0..67a6dc7 100644 --- 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 diff --git a/pcmanfm/CMakeLists.txt b/pcmanfm/CMakeLists.txt index d6a7fd8..02d54c0 100644 --- 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 diff --git a/pcmanfm/application.cpp b/pcmanfm/application.cpp index 86fd524..21babe7 100644 --- 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(); diff --git a/pcmanfm/application.h b/pcmanfm/application.h index e3b1669..dfaaf96 100644 --- a/pcmanfm/application.h +++ b/pcmanfm/application.h @@ -31,7 +31,6 @@ #include #include - class QScreen; class QFileSystemWatcher; diff --git a/pcmanfm/desktop-preferences.ui b/pcmanfm/desktop-preferences.ui index 746c11c..f01c5bb 100644 --- a/pcmanfm/desktop-preferences.ui +++ b/pcmanfm/desktop-preferences.ui @@ -200,6 +200,82 @@ + + + + Spacing + + + + + + Minimum item margins: + + + + + + + 3 px by default. + + + px + + + 48 + + + 3 + + + + + + + x + + + + + + + 1 px by default. +A space is also reserved for 3 lines of text. + + + px + + + 48 + + + 1 + + + + + + + Lock + + + + + + + Qt::Horizontal + + + + 20 + 5 + + + + + + + diff --git a/pcmanfm/desktopitemdelegate.cpp b/pcmanfm/desktopitemdelegate.cpp index 5d7abbc..22a569f 100644 --- 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. diff --git a/pcmanfm/desktopitemdelegate.h b/pcmanfm/desktopitemdelegate.h index 3162691..deb9bed 100644 --- 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_; }; } diff --git a/pcmanfm/desktoppreferencesdialog.cpp b/pcmanfm/desktoppreferencesdialog.cpp index 8f52730..f414120 100644 --- 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(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue); + } + else + disconnect(ui.hMargin, static_cast(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue); +} + void DesktopPreferencesDialog::applySettings() { Settings& settings = static_cast(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(); } diff --git a/pcmanfm/desktoppreferencesdialog.h b/pcmanfm/desktoppreferencesdialog.h index d5ead06..f3a0af4 100644 --- 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(); diff --git a/pcmanfm/desktopwindow.cpp b/pcmanfm/desktopwindow.cpp index fcdf1a2..fbabdd9 100644 --- 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(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); diff --git a/pcmanfm/desktopwindow.h b/pcmanfm/desktopwindow.h index cfd79b0..9d112d5 100644 --- 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_; diff --git a/pcmanfm/main-win.ui b/pcmanfm/main-win.ui index 5691de0..00509db 100644 --- a/pcmanfm/main-win.ui +++ b/pcmanfm/main-win.ui @@ -92,6 +92,9 @@ true + + Focus with Ctrl+I + @@ -167,6 +170,7 @@ + @@ -244,6 +248,8 @@ + + @@ -636,6 +642,9 @@ &Close Window + + Ctrl+Q + @@ -699,6 +708,9 @@ &Filter + + Ctrl+B + @@ -723,6 +735,31 @@ Close &other tabs + + + true + + + Menu bar + + + Menu bar + + + Ctrl+M + + + + + + + + Menu + + + Menu + + diff --git a/pcmanfm/mainwindow.cpp b/pcmanfm/mainwindow.cpp index e7f1118..4bb789a 100644 --- 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 list = ui.toolBar->findChildren(); + 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(&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(&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()) { 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(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(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(ui.stackedWidget->widget(i)); + if(!page->getFilterStr().isEmpty()) { + page->setFilterStr(QString()); + page->applyFilter(); + } + } + } static_cast(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 diff --git a/pcmanfm/mainwindow.h b/pcmanfm/mainwindow.h index 310f273..dc69494 100644 --- 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(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); diff --git a/pcmanfm/preferences.ui b/pcmanfm/preferences.ui index e7f54ae..81bb67b 100644 --- a/pcmanfm/preferences.ui +++ b/pcmanfm/preferences.ui @@ -291,22 +291,22 @@ User interface - - + + Use SI decimal prefixes instead of IEC binary prefixes - + Treat backup files as hidden - + false @@ -316,7 +316,7 @@ - + false @@ -326,6 +326,89 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + Minimum item margins in icon view: + + + + + + + 3 px by default. + + + px + + + 48 + + + 3 + + + + + + + x + + + + + + + 3 px by default. +A space is also reserved for 3 lines of text. + + + px + + + 48 + + + 3 + + + + + + + Lock + + + + + + + Qt::Horizontal + + + + 20 + 5 + + + + @@ -363,47 +446,58 @@ + + + If unchecked, the tab bar will be positioned only +above the folder-view and not above the left pane. + + + Fullwidth tab bar + + + + Show 'Close' buttons on tabs - + Remember the size of the last closed window - + Default width of new windows: - + + + + 32768 + + + + Default height of new windows: - + 32768 - - - - 32768 - - - diff --git a/pcmanfm/preferencesdialog.cpp b/pcmanfm/preferencesdialog.cpp index ecae7d8..b230bba 100644 --- 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(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(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(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue); + } + else + disconnect(ui.hMargin, static_cast(&QSpinBox::valueChanged), ui.vMargin, &QSpinBox::setValue); +} + } // namespace PCManFM diff --git a/pcmanfm/preferencesdialog.h b/pcmanfm/preferencesdialog.h index 28cf210..0228782 100644 --- 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); diff --git a/pcmanfm/settings.cpp b/pcmanfm/settings.cpp index 1fac65d..cd80677 100644 --- 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 diff --git a/pcmanfm/settings.h b/pcmanfm/settings.h index cf8db3d..8466baa 100644 --- 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_; }; } diff --git a/pcmanfm/tabpage.cpp b/pcmanfm/tabpage.cpp index b40f872..7d3ffc3 100644 --- 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); diff --git a/pcmanfm/translations/pcmanfm-qt-desktop-pref_ru_RU.desktop b/pcmanfm/translations/pcmanfm-qt-desktop-pref_ru_RU.desktop deleted file mode 100644 index d579083..0000000 --- a/pcmanfm/translations/pcmanfm-qt-desktop-pref_ru_RU.desktop +++ /dev/null @@ -1,4 +0,0 @@ -#Translations -Name[ru_RU]=Рабочий стол -GenericName[ru_RU]=Настройки рабочего стола -Comment[ru_RU]=Изменить обои и поведение менеджера рабочего стола \ No newline at end of file diff --git a/pcmanfm/translations/pcmanfm-qt-desktop-pref_tr.desktop b/pcmanfm/translations/pcmanfm-qt-desktop-pref_tr.desktop new file mode 100644 index 0000000..3178a89 --- /dev/null +++ b/pcmanfm/translations/pcmanfm-qt-desktop-pref_tr.desktop @@ -0,0 +1,4 @@ +#Translations / translated by tulliana +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..) diff --git a/pcmanfm/translations/pcmanfm-qt_cs_CZ.ts b/pcmanfm/translations/pcmanfm-qt_cs_CZ.ts index 829ab6a..c7760ce 100644 --- 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.< Authors - Autoři + Autoři License - Licence + Licence @@ -203,7 +203,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Advanced - Pokročilé + @@ -245,7 +245,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Home - + &Domů @@ -290,7 +290,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Computer - Počítač + P&očítač @@ -300,122 +300,122 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Network - Síť + &Síť &Desktop - Plocha + P&locha &Add to Bookmarks - Přidat k záložkám + &Přidat k záložkám &Applications - Programy + P&rogramy Ctrl+X - Ctrl+X + Ctrl+X &Copy - Kopírovat + &Kopírovat Ctrl+C - Ctrl+C + Ctrl+C &Paste - Vložit + &Vložit Ctrl+V - Ctrl+V + Ctrl+V Select &All - Vybrat všechno + Vybr&at všechno Pr&eferences - &Nastavení + &Předvolby &Ascending - + &Vzestupně &Descending - + &Sesupně &By File Name - + Podle &jména By &Modification Time - + Podle č&asu By File &Type - + Podle &typu By &Owner - + Podle v&lastníka &Folder First - + &Adresáře jako pvní &Invert Selection - Invertovat výběr + &Invertovat výběr &Delete - Smazat + &Smazat &Rename - Přejmenovat + Pře&jmenovat &Case Sensitive - + &Zohlednit velikost písmen By File &Size - + Podle v&elikosti &Close Window - + &Zavřít okno @@ -425,7 +425,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Go &Up - Nahoru + &Nahoru @@ -435,27 +435,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Icon View - Pohled s ikonami + &Ikony &Compact View - Kompaktní pohled + &Kompaktní &Detailed List - Seznam s podrobnostmi + &Podrobnosti &Thumbnail View - Pohled s náhledy + &Náhledy Cu&t - Vyjmout + V&yjmout Ascending @@ -503,7 +503,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Go &Back - Zpět + &Zpět @@ -558,27 +558,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Ctrl+Shift+N - + Ctrl+Shift+N Ctrl+Alt+N - + Ctrl+Alt+N Filter - + Filtrovat C&reate New - + Vytvořit &nový &Sorting - Řadit + Ř&adit @@ -630,32 +630,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Edit Bookmarks - Upravit záložky + &Upravit záložky &Folder - + &Složku &Blank File - + &Prázdný soubor &Find Files - + Najít soubory F3 - + F3 Filter by string... - + Filtrovat podle řetězce... @@ -872,7 +872,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Delete - Smazat + @@ -968,168 +968,168 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Preferences - + Předvolby User Interface - Uživatelské rozhraní + Uživatelské rozhraní Behavior - Chování + Chování Thumbnail - Náhled + Náhled Volume - + Úložiště Advanced - Pokročilé + Pokročilé Icons - + Ikony Size of big icons: - Velikost velkých ikon: + Velikost velkých ikon: Size of small icons: - Velikost malých ikon: + Velikost malých ikon: Size of thumbnails: - Velikost náhledů: + Velikost náhledů: Size of side pane icons: - Velikost ikon v postranním panelu: + Velikost ikon v postranním panelu: Icon theme: - + Téma ikon: Window - + Okno Default width of new windows: - + Výchozí šířka nových oken: Default height of new windows: - + Výchozí výška nových oken: Always show the tab bar - + Vždycky zobrazovat lištu s panely Show 'Close' buttons on tabs - + Zobrazovat tlačítko 'Zavřít' na panelech Remember the size of the last closed window - + Pamatovat si rozměry naposedy zavřeného okna Browsing - + Prohlížení Open files with single click - + Otvírat soubory jedním kliknutím Delay of auto-selection in single click mode (0 to disable) - + Zpoždění automatického výběru v jednoklikacím režimu (0 pro zákaz) Default view mode: - + Výchozí režim pohledu: sec - + s File Operations - + Operace se soubory Confirm before deleting files - + Potvrdit mazání souborů Move deleted files to "trash bin" instead of erasing from disk. - + Přesunout mazané soubory do koše místo smazání z disku. Show thumbnails of files - Zobrazovat náhledy souborů + Zobrazovat náhledy souborů Only show thumbnails for local files - Zobrazovat náhlet jen u lokálních souborů + Zobrazovat náhled jen u lokálních souborů Display - + Zobrazení Bookmarks: - + Záložky: Open in current tab - + Otvírat v současném panelu Open in new tab - + Otvírat v novém panelu Open in new window - + Otvírat v novém okně @@ -1149,7 +1149,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< User interface - + Uživatelské rozhraní @@ -1209,12 +1209,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Do not generate thumbnails for image files exceeding this size: - Negenerovat náhledy obrázků přesahujících tuto velikost: + Negenerovat náhledy obrázků přesahujících tuto velikost: KB - + KB @@ -1224,42 +1224,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Mount mountable volumes automatically on program startup - + Připojit přenosná úložiště automaticky při startu programu Mount removable media automatically when they are inserted - + Připojit přenosná úložiště automaticky když jsou vložena Show available options for removable media when they are inserted - + Zobrazit pokročilé volby pro přenosná úložiště když jsou vložena When removable medium unmounted: - + Když je přenosné úložiště odpojeno: Close &tab containing removable medium - + &Zavřít panel obsahující přenosné úložiště Chan&ge folder in the tab to home folder - + Změnit adresář v panelu na &domovský Switch &user command: - + Příkaz k přepnutí &uživatele: Archiver in&tegration: - + Propojení s &archivátorem: @@ -1284,18 +1284,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Programs - + Programy Terminal emulator: - + Emulátor terminálu: Examples: "xterm -e %s" for terminal or "gksu %s" for switching user. %s = the command line you want to execute with terminal or su. - + Příklady: "xterm -e %s" pro terminál nebo "gksu %s" pro přepnutí uživatele. +%s = příkazový řádek, který chceš spustit terminálem nebo su. diff --git a/pcmanfm/translations/pcmanfm-qt_el.ts b/pcmanfm/translations/pcmanfm-qt_el.ts index 9477c98..0929683 100644 --- a/pcmanfm/translations/pcmanfm-qt_el.ts +++ b/pcmanfm/translations/pcmanfm-qt_el.ts @@ -910,7 +910,7 @@ USA. Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile) - Ορισμός της λειτουργίας της επιφάνειας ΛΕΙΤΟΥΡΓΙΑ=(χρώμα|τέντωμα|προσαρμογή|κέντρο|παράθεση) + Ορισμός της λειτουργίας της επιφάνειας ΛΕΙΤΟΥΡΓΙΑ=(color|stretch|fit|center|tile) diff --git a/pcmanfm/translations/pcmanfm-qt_es.ts b/pcmanfm/translations/pcmanfm-qt_es.ts index 6fb7c1d..60f3f26 100644 --- 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. Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile) - Definir modo de papel tapiz. MODO =(color|estirar|ajustar|centrar|repetir) + Definir modo de papel tapiz. MODO =(color|stretch|fit|center|tile) diff --git a/pcmanfm/translations/pcmanfm-qt_fr.ts b/pcmanfm/translations/pcmanfm-qt_fr.ts index e5d7245..f8070fc 100644 --- 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. &View - &Voir + &Affichage @@ -795,7 +795,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile) - Définir le mode de fond d'écran de bureau. MODE=(couleur|étirer|ajuster|centrer|découper) + Définir le mode de fond d'écran de bureau. MODE=(color|stretch|fit|center|tile) @@ -942,7 +942,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. Compact Icon View - Vue en icônes compacte + Vue compacte @@ -1118,7 +1118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. Default view mode: - Mode de vue par défaut : + Mode d'affichage par défaut : @@ -1153,7 +1153,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. Display - + Affichage diff --git a/pcmanfm/translations/pcmanfm-qt_it.ts b/pcmanfm/translations/pcmanfm-qt_it.ts index a1cee94..8d22a13 100644 --- 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.< Display - Schermo + Visualizza diff --git a/pcmanfm/translations/pcmanfm-qt_pl.ts b/pcmanfm/translations/pcmanfm-qt_pl.ts index 1c3339b..05eb815 100644 --- 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.< Desktop - Pulpit + Pulpit Desktop folder: - Katalog Pulpitu: + Katalog Pulpitu: Image file - Plik obrazka + Plik obrazka Folder path - Ścieżka katalogu + Ścieżka katalogu &Browse - &Wybierz + &Wybierz @@ -370,7 +370,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Home - + Katalog &użytkownika @@ -480,37 +480,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Ascending - + &Rosnąco &Descending - + &Malejąco &By File Name - + &Nazwa By &Modification Time - + Data &modyfikacji By File &Type - + &Typ pliku By &Owner - + W&łaściciel &Folder First - + Najpierw &katalogi @@ -530,17 +530,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Case Sensitive - + Uwzględniaj wielkość &liter By File &Size - + Według &rozmiaru &Close Window - + &Zamknij okno @@ -706,7 +706,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Sorting - &Sortowanie + &Uszereguj według @@ -763,32 +763,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< &Folder - + &Katalog &Blank File - + &Pusty plik &Find Files - + &Znajdź pliki F3 - F3 + F3 Filter - + Filtruj Filter by string... - + Wpisz część nazwy pliku... @@ -877,7 +877,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Open Find Files utility - + Otwórz narzędzie wyszukiwania @@ -990,7 +990,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Clear text (Ctrl+K) - + Usuń tekst (Ctrl+K) @@ -1242,7 +1242,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Display - + Wygląd @@ -1267,7 +1267,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Erase files on removable media instead of "trash can" creation - + Usuwaj pliki na urządzeniach wymiennych zamiast przenosić je do kosza @@ -1277,7 +1277,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Don't ask options on launch executable file - + Nie pytaj o parametry przy uruchamianiu plików wykonywalnych @@ -1287,7 +1287,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Treat backup files as hidden - + Traktuj pliki kopii zapasowych jako ukryte @@ -1297,12 +1297,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Show icons of hidden files shadowed - + Przytłumione ikony dla plików ukrytych Show in places - + Pokaż w położeniach @@ -1377,22 +1377,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Close &tab containing removable medium - Zamknij zakładkę nośnika wymiennego + Zamknij &kartę nośnika wymiennego Chan&ge folder in the tab to home folder - Zmień katalog w zakładce na katalog użytkownika + Z&mień katalog w karcie na katalog użytkownika Switch &user command: - + Polecenie przełączania &użytkownika: Archiver in&tegration: - Menedżer archiwów + Menedżer &archiwów: @@ -1402,7 +1402,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Show only user defined templates in menu - + Pokazuj w menu tylko szablony zdefiniowane przez użytkownika @@ -1412,7 +1412,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< Run default application after creation from template - + Uruchom domyślną aplikację po utworzeniu pliku z szablonu Close tab containing removable medium diff --git a/pcmanfm/translations/pcmanfm-qt_ru.ts b/pcmanfm/translations/pcmanfm-qt_ru.ts index d09589b..3f7fb23 100644 --- 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, Form - + @@ -215,18 +215,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Window Manager Оконный менеджер - - Desktop - Рабочий стол - - - Desktop folder: - Папка рабочего стола: - - - Folder path - Путь к папке - Advanced @@ -235,7 +223,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Show menus provided by window managers when desktop is clicked - Показывать меню, предоставляемые оконными менеджерами по клику на рабочий стол + Показывать меню, предоставляемые оконными менеджерами, по клику на рабочий стол @@ -243,7 +231,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Find Files - Найnb файлы + Найти файлы @@ -264,7 +252,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Case insensitive - Регистрочувствительный + Нечувствительный к регистру @@ -341,7 +329,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, File contains - Содержание файла + Файл содержит @@ -356,12 +344,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Bigger than: - Больше чем: + Больше, чем: Smaller than: - Меньше чем: + Меньше, чем: @@ -371,12 +359,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Earlier than: - Раньше чем: + Раньше, чем: Later than: - Позже чем: + Позже, чем: @@ -414,7 +402,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, C&reate New - С&оздать новое + &Создать @@ -459,7 +447,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Go &Up - Перейти &вверх + Перейти вв&ерх @@ -509,7 +497,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, &New Window - &Новое окно + Новое &окно @@ -669,7 +657,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, &Case Sensitive - &Регистрочувствительная + &Чувствительная к регистру @@ -704,17 +692,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Close &left tabs - Закрыть вкладки &слева + Закрыть вкладки с&лева Close &right tabs - Закрыть вкладки &справа + Закрыть вкладки с&права Close &other tabs - Закрыть &другие + Закрыть &остальные вкладки @@ -799,7 +787,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, File &Properties - &Свойства файла + Свойства &файла @@ -809,7 +797,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, &Folder Properties - &Свойства папки + Свойства &папки @@ -893,7 +881,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile) - Выбрать режим обоев рабочего стола. РЕЖИМ=(цвет|растянуть|вместить|по центру|черепицей) + Выбрать режим обоев рабочего стола. РЕЖИМ=(color|stretch|fit|center|tile) @@ -1158,7 +1146,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Size of thumbnails: - Размер значков: + Размер эскизов: @@ -1238,7 +1226,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Move deleted files to "trash bin" instead of erasing from disk. - Перемещать удалённые файлы в корзину вместо удаления их с диска. + Перемещать удалённые файлы в «корзину» вместо удаления их с диска. @@ -1278,12 +1266,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Erase files on removable media instead of "trash can" creation - Удалять файлы на съёмных носителях вместо создания «Корзины» + Удалять файлы на съёмных носителях вместо создания «корзины» Confirm before moving files into "trash can" - Просить подтверждения перед удалением файлов в «Корзину» + Подтверждение перед перемещением файлов в «корзину» @@ -1318,7 +1306,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Home - Домой + Дом @@ -1373,7 +1361,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Mount removable media automatically when they are inserted - Подключать съёмные тома автоматически при их подключении + Подключать съёмные тома автоматически при их вставлении @@ -1413,7 +1401,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Show only user defined templates in menu - Показывать только шаблоны, определённые пользователем, в меню + Показывать в меню только шаблоны, определённые пользователем @@ -1423,7 +1411,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, Run default application after creation from template - Запускать приложение по умолчанию после создания шаблона + Запускать приложение по умолчанию после создания из шаблона diff --git a/pcmanfm/translations/pcmanfm-qt_ru_RU.desktop b/pcmanfm/translations/pcmanfm-qt_ru_RU.desktop deleted file mode 100644 index 7f7a0fd..0000000 --- a/pcmanfm/translations/pcmanfm-qt_ru_RU.desktop +++ /dev/null @@ -1,4 +0,0 @@ -#Translations -Name[ru_RU]=Диспетчер файлов PCManFM -GenericName[ru_RU]=Диспетчер файлов -Comment[ru_RU]=Просматривайте файловую систему и управляйте файлами \ No newline at end of file diff --git a/pcmanfm/translations/pcmanfm-qt_ru_RU.ts b/pcmanfm/translations/pcmanfm-qt_ru_RU.ts deleted file mode 100644 index ad922f8..0000000 --- a/pcmanfm/translations/pcmanfm-qt_ru_RU.ts +++ /dev/null @@ -1,1451 +0,0 @@ - - - - - AboutDialog - - - About - О программе - - - - <html><head/><body><p><span style=" font-size:16pt; font-weight:600;">PCManFM</span></p></body></html> - <html><head/><body><p><span style=" font-size:16pt; font-weight:600;">PCManFM</span></p></body></html> - - - - Lightweight file manager - Легковесный диспетчер файлов - - - - <html><head/><body><p><a href="http://lxqt.org/"><span style=" text-decoration: underline; color:#0000ff;">http://lxqt.org/</span></a></p></body></html> - <html><head/><body><p><a href="http://lxqt.org/"><span style=" text-decoration: underline; color:#0000ff;">http://lxqt.org/</span></a></p></body></html> - - - - Authors - Авторы - - - - Programming: -* Hong Jen Yee (PCMan) <pcman.tw@gmail.com> - - Программирование: -* Hong Jen Yee (PCMan) <pcman.tw@gmail.com> - - - - - License - Лицензия - - - - PCMan File Manager - -Copyright (C) 2009 - 2014 洪任諭 (Hong Jen Yee) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Файловый менеджер PCMan - -Авторское право (C) 2009 - 2014 洪任諭 (Hong Jen Yee) - -Эта программа является свободным программным обеспечением; -вы можете распространять и/или модифицировать ее согласно -условиям стандартной общественной лицензии GNU, опубликованной -Фондом свободного ПО; либо версии 2 лицензии, либо -(по вашему выбору) любой более поздней версии. - -Эта программа распространяется в надежде что она будет полезной, -но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; даже без подразумеваемых гарантий -КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. -Смотрите Стандартную Общественную Лицензию GNU для большего -количества деталей. - -Вы должны были получить копию Стандартной Общественной Лицензии GNU -вместе с этой программой; если лицензии не было, напишите в Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, США. - - - - AutoRunDialog - - - Removable medium is inserted - Вставлен съёмный носитель - - - - <b>Removable medium is inserted</b> - <b>Вставлен съёмный носитель</b> - - - - Type of medium: - Тип носителя: - - - - Detecting... - Обнаружение... - - - - Please select the action you want to perform: - Выберите действие, которое хотите совершить: - - - - DesktopFolder - - - Form - - - - - Desktop - Рабочий стол - - - - Desktop folder: - Папка рабочего стола: - - - - Image file - Файл изображения - - - - Folder path - Путь к папке - - - - &Browse - &Обзор - - - - DesktopPreferencesDialog - - - Desktop Preferences - Настройки рабочего стола - - - - General - Общие - - - - Background - Фон - - - - Wallpaper mode: - Режим обоев: - - - - Wallpaper image file: - Файл изображения обоев: - - - - Select background color: - Выбрать цвет фона: - - - - Image file - Файл изображения - - - - Image file path - Путь к файлу изображения - - - - &Browse - &Обзор - - - - Label Text - Текст ярлыков - - - - Select text color: - Выбрать цвет текста: - - - - Select shadow color: - Выбрать цвет тени: - - - - Select font: - Выбрать шрифт: - - - - Window Manager - Оконный менеджер - - - Desktop - Рабочий стол - - - Desktop folder: - Папка рабочего стола: - - - Folder path - Путь к папке - - - - Advanced - Расширенные - - - - Show menus provided by window managers when desktop is clicked - Показывать меню, предоставляемые оконными менеджерами по клику на рабочий стол - - - - FindFilesDialog - - - Find Files - Найnb файлы - - - - Name/Location - Имя/расположение - - - - File name patterns - Шаблоны имён файлов - - - - Pattern: - Шаблон: - - - - - Case insensitive - Регистрочувствительный - - - - - Use regular expression - Использовать регулярные выражения - - - - Places to search - Места поиска - - - - Add - Добавить - - - - Remove - Удалить - - - - Search in sub directories - Искать в подпапках - - - - Search hidden files - Искать скрытые файлы - - - - - File Type - Тип файла - - - - Only search for files of following types: - Искать только следующие типы файлов: - - - - Text files - Текстовые файлы - - - - Image files - Файлы изображений - - - - Audio files - Аудиофайлы - - - - Video files - Видеофайлы - - - - Documents - Документы - - - - Content - Содержание - - - - File contains - Содержание файла - - - - Properties - Свойства - - - - File Size - Размер файла - - - - Bigger than: - Больше чем: - - - - Smaller than: - Меньше чем: - - - - Last Modified Time - Время последнего изменения - - - - Earlier than: - Раньше чем: - - - - Later than: - Позже чем: - - - - MainWindow - - - File Manager - Диспетчер файлов - - - - Ctrl+Shift+N - - - - - Ctrl+Alt+N - - - - - Filter - Фильтр - - - - Filter by string... - Фильтровать по строке... - - - - &File - &Файл - - - - C&reate New - С&оздать новое - - - - &Help - &Справка - - - - &View - &Вид - - - - &Sorting - &Сортировка - - - - &Edit - &Правка - - - - &Bookmarks - &Закладки - - - - &Go - &Перейти - - - - &Tool - &Инструмент - - - - Main Toolbar - Главная панель инструментов - - - - Go &Up - Перейти &вверх - - - - Go Up - Перейти вверх - - - - Alt+Up - - - - - &Home - &Домой - - - - Alt+Home - - - - - &Reload - &Обновить - - - - F5 - - - - - Go - Перейти - - - - Quit - Выйти - - - - &About - &О программе - - - - &New Window - &Новое окно - - - - New Window - Новое окно - - - - Ctrl+N - - - - - Show &Hidden - Показать &скрытые - - - - Ctrl+H - - - - - &Computer - &Компьютер - - - - &Trash - &Корзина - - - - &Network - &Сеть - - - - &Desktop - &Рабочий стол - - - - &Add to Bookmarks - &Добавить в закладки - - - - &Applications - &Приложения - - - - Reload - Обновить - - - - &Icon View - Просмотр &значками - - - - &Compact View - &Компактный просмотр - - - - &Detailed List - Просмотр &подробным списком - - - - &Thumbnail View - Просмотр &эскизами - - - - Cu&t - &Вырезать - - - - Ctrl+X - - - - - &Copy - &Копировать - - - - Ctrl+C - - - - - &Paste - &Вставить - - - - Ctrl+V - - - - - Select &All - Выделить &всё - - - - Ctrl+A - - - - - Pr&eferences - &Настройки - - - - &Ascending - По &возрастанию - - - - &Descending - По &убыванию - - - - &By File Name - &По имени файла - - - - By &Modification Time - По времени &изменения - - - - By File &Type - По &типу файла - - - - By &Owner - По &владельцу - - - - &Folder First - Сначала &папки - - - - &Case Sensitive - &Регистрочувствительная - - - - By File &Size - По &размеру файла - - - - &Close Window - &Закрыть окно - - - - &Folder - &Папка - - - - &Blank File - &Пустой файл - - - - &Find Files - &Найти файлы - - - - F3 - - - - - Close &left tabs - Закрыть вкладки &слева - - - - Close &right tabs - Закрыть вкладки &справа - - - - Close &other tabs - Закрыть &другие - - - - New &Tab - Новая &вкладка - - - - New Tab - Новая вкладка - - - - Ctrl+T - - - - - Go &Back - Перейти &назад - - - - Go Back - Перейти назад - - - - Alt+Left - - - - - Go &Forward - Перейти &вперёд - - - - Go Forward - Перейти вперёд - - - - Alt+Right - - - - - &Invert Selection - &Инвертировать выделение - - - - &Delete - &Удалить - - - - Del - - - - - &Rename - &Переименовать - - - - F2 - - - - - C&lose Tab - &Закрыть вкладку - - - - Ctrl+W - - - - - File &Properties - &Свойства файла - - - - Alt+Return - - - - - &Folder Properties - &Свойства папки - - - - Edit Bookmarks - Изменить закладки - - - - Open &Terminal - Открыть &терминал - - - - F4 - - - - - Open as &Root - Открыть от имени &суперпользователя - - - - &Edit Bookmarks - &Изменить закладки - - - - PCManFM::Application - - - Name of configuration profile - Имя профиля конфигурации - - - - PROFILE - ПРОФИЛЬ - - - - Run PCManFM as a daemon - Запустить PCManFM как демон - - - - Quit PCManFM - Выйти из PCManFM - - - - Launch desktop manager - Запустить менеджер рабочего стола - - - - Turn off desktop manager if it's running - Отключить менеджер рабочего стола, если он запущен - - - - Open desktop preference dialog on the page with the specified name - Открыть диалог настроек рабочего стола на странице с указанным именем - - - - - NAME - ИМЯ - - - - Set desktop wallpaper from image FILE - Выбрать обои рабочего стола из ФАЙЛА изображения - - - - FILE - ФАЙЛ - - - - Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile) - Выбрать режим обоев рабочего стола. РЕЖИМ=(цвет|растянуть|вместить|по центру|черепицей) - - - - MODE - РЕЖИМ - - - - Open Preferences dialog on the page with the specified name - Открыть диалог настроек на странице с указанным именем - - - - Open new window - Открыть новое окно - - - - Open Find Files utility - Открыть утилиту поиска файлов - - - - [FILE1, FILE2,...] - [ФАЙЛ1, ФАЙЛ2,...] - - - - Files or directories to open - Файлы или папки для открытия - - - - - Error - Ошибка - - - - Terminal emulator is not set. - Эмулятор терминала не указан. - - - - PCManFM::AutoRunDialog - - - Open in file manager - Открыть в диспетчере файлов - - - - Removable Disk - Съёмный диск - - - - PCManFM::DesktopPreferencesDialog - - - Fill with background color only - Заполнить только цветом фона - - - - Stretch to fill the entire screen - Растянуть по всему экрану - - - - Stretch to fit the screen - Растянуть по размеру экрана - - - - Center on the screen - По центру экрана - - - - Tile the image to fill the entire screen - Плиточное заполнение всего экрана изображением - - - - Image Files - Файлы изображений - - - - PCManFM::DesktopWindow - - - Stic&k to Current Position - &Прикрепить к текущему положению - - - - Desktop Preferences - Настройки рабочего стола - - - - PCManFM::MainWindow - - - Clear text (Ctrl+K) - Стереть текст (Ctrl+K) - - - - Version: %1 - Версия: %1 - - - - &Move to Trash - &Переместить в корзину - - - - &Delete - &Удалить - - - - - Error - Ошибка - - - - Switch user command is not set. - Команда переключения пользователя не задана. - - - - PCManFM::PreferencesDialog - - - Icon View - Просмотр значками - - - - Compact Icon View - Просмотр компактными значками - - - - Thumbnail View - Просмотр эскизами - - - - Detailed List View - Просмотр подробным списком - - - - PCManFM::TabPage - - - Error - Ошибка - - - - Free space: %1 (Total: %2) - Свободное место: %1 (всего: %2) - - - - %n item(s) - - %n объект - %n объекта - %n объектов - - - - - (%n hidden) - - (%n скрыт) - (%n скрыто) - (%n скрыто) - - - - - %1 item(s) selected - %1 объекта(ов) выделено - - - - PCManFM::View - - - Open in New T&ab - Открыть в новой &вкладке - - - - Open in New Win&dow - Открыть в новом &окне - - - - Open in Termina&l - Открыть в &терминале - - - - PreferencesDialog - - - Preferences - Настройки - - - - User Interface - Интерфейс пользователя - - - - Behavior - Поведение - - - - - Thumbnail - Эскизы - - - - Volume - Том - - - - Advanced - Расширенные - - - - Icons - Значки - - - - Size of big icons: - Размер больших значков: - - - - Size of small icons: - Размер маленьких значков: - - - - Size of thumbnails: - Размер значков: - - - - Size of side pane icons: - Размер значков боковой панели: - - - - Icon theme: - Тема значков: - - - - Window - Окно - - - - Always show the tab bar - Всегда показывать панель вкладок - - - - Show 'Close' buttons on tabs - Показывать кнопку «Закрыть» на вкладках - - - - Remember the size of the last closed window - Запоминать размер последнего закрытого окна - - - - Default width of new windows: - Ширина новых окон по умолчанию: - - - - Default height of new windows: - Высота новых окон по умолчанию: - - - - Browsing - Просмотр - - - - Open files with single click - Открывать файлы по одиночному щелчку мыши - - - - Delay of auto-selection in single click mode (0 to disable) - Задержка автовыделения в режиме одиночного щелчка (0 для отключения) - - - - Default view mode: - Режим просмотра по умолчанию: - - - - sec - сек - - - - File Operations - Операции с файлами - - - - Confirm before deleting files - Подтверждение перед удалением файлов - - - - Move deleted files to "trash bin" instead of erasing from disk. - Перемещать удалённые файлы в корзину вместо удаления их с диска. - - - - Show thumbnails of files - Показывать эскизы файлов - - - - Only show thumbnails for local files - Показывать эскизы только для локальных файлов - - - - Display - Вид - - - - Bookmarks: - Закладки: - - - - Open in current tab - Открывать в текущей вкладке - - - - Open in new tab - Открывать в новой вкладке - - - - Open in new window - Открывать в новом окне - - - - Erase files on removable media instead of "trash can" creation - Удалять файлы на съёмных носителях вместо создания «Корзины» - - - - Confirm before moving files into "trash can" - Просить подтверждения перед удалением файлов в «Корзину» - - - - Don't ask options on launch executable file - Не предлагать варианты запуска исполняемых файлов - - - - User interface - Интерфейс пользователя - - - - Treat backup files as hidden - Рассматривать резервные файлы как скрытые - - - - Always show full file names - Всегда показывать полные имена файлов - - - - Show icons of hidden files shadowed - Показывать значки скрытых файлов затенёнными - - - - Show in places - Показвать в «Местах» - - - - Home - Домой - - - - Desktop - Рабочий стол - - - - Trash can - Корзина - - - - Computer - Компьютер - - - - Applications - Приложения - - - - Devices - Устройства - - - - Network - Сеть - - - - Do not generate thumbnails for image files exceeding this size: - Не создавать эскизы для файлов изображений больших чем: - - - - KB - КБ - - - - Auto Mount - Автоподключение - - - - Mount mountable volumes automatically on program startup - Подключать съёмные тома автоматически при запуске программы - - - - Mount removable media automatically when they are inserted - Подключать съёмные тома автоматически при их подключении - - - - Show available options for removable media when they are inserted - Показывать доступные варианты для съёмных устройств при их вставлении - - - - When removable medium unmounted: - При отключении съёмного устройства: - - - - Close &tab containing removable medium - Закрыть &вкладку, отображающую содержимое съёмного носителя - - - - Chan&ge folder in the tab to home folder - Изме&нить папку во вкладке на домашнюю - - - - Switch &user command: - Команда смены &пользователя: - - - - Archiver in&tegration: - Ин&теграция с архиваторами: - - - - Templates - Шаблоны - - - - Show only user defined templates in menu - Показывать только шаблоны, определённые пользователем, в меню - - - - Show only one template for each MIME type - Показывать только один шаблон для каждого типа MIME - - - - Run default application after creation from template - Запускать приложение по умолчанию после создания шаблона - - - - Programs - Программы - - - - Terminal emulator: - Эмулятор терминала: - - - - Examples: "xterm -e %s" for terminal or "gksu %s" for switching user. -%s = the command line you want to execute with terminal or su. - Примеры: "xterm -e %s" для терминала или "gksu %s" для переключения пользователя. -%s = командная строка,которую вы хотите выполнить с терминалом или su. - - - - Use SI decimal prefixes instead of IEC binary prefixes - Использовать десятичные префиксы СИ вместо двоичных префиксов IEC - - - diff --git a/pcmanfm/translations/pcmanfm-qt_tr.desktop b/pcmanfm/translations/pcmanfm-qt_tr.desktop new file mode 100644 index 0000000..49cfe8b --- /dev/null +++ b/pcmanfm/translations/pcmanfm-qt_tr.desktop @@ -0,0 +1,4 @@ +#Translations / translated by tulliana +Name[tr]=PCManFM-Qt +GenericName[tr]=Dosya Yönetici +Comment[tr]=Lxqt dosya ve masaüstü yöneticisi diff --git a/pcmanfm/translations/pcmanfm-qt_tr_TR.ts b/pcmanfm/translations/pcmanfm-qt_tr_TR.ts new file mode 100644 index 0000000..624218b --- /dev/null +++ b/pcmanfm/translations/pcmanfm-qt_tr_TR.ts @@ -0,0 +1,1277 @@ + + + + + AboutDialog + + + About + Hakkında + + + + <html><head/><body><p><span style=" font-size:16pt; font-weight:600;">PCManFM</span></p></body></html> + <html><head/><body><p><span style=" font-size:16pt; font-weight:600;">PCManFM</span></p></body></html> + + + + Lightweight file manager + Hafif bir dosya yöneticisi + + + + <html><head/><body><p><a href="http://lxqt.org/"><span style=" text-decoration: underline; color:#0000ff;">http://lxqt.org/</span></a></p></body></html> + <html><head/><body><p><a href="http://lxqt.org/"><span style=" text-decoration: underline; color:#0000ff;">http://lxqt.org/</span></a></p></body></html> + + + + Programming: +* Hong Jen Yee (PCMan) <pcman.tw@gmail.com> + + Programcı: +* Hong Jen Yee (PCMan) <pcman.tw@gmail.com> + + + + Authors + Sahiplik + + + + PCMan File Manager + +Copyright (C) 2009 - 2014 洪任諭 (Hong Jen Yee) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + PCMan Dosya Yöneticisi + +Telif Hakkı (C) 2009 - 2014 洪任諭 (Hong Jen Yee) + +Bu program ücretsiz bir yazılımdır; bunu dağıtabilir veya +GNU Genel Kamu Lisansı kapsamında değiştirebilirsiniz +Özgür Yazılım Vakfı lisansı altında yada +benzeri başka bir lisans altında bir sürüm çatallayabilirsiniz. + +Bu program faydalı olacağı amacıyla geliştirilmiştir, +fakat size hiçbir kullanım garantisi vermez. +Belirli bir amaca katkı vermek için kamu yararına geliştirildi. +Daha fazla bilgi edinmek için GNU Genel Kamu Lisansını inceleyin. + +Bu program ile birlikte GNU Genel Kamu Lisansını +kabul etmiş varsayılırsınız. +VAKIF, Inc., 51 Franklin Caddesi, Beşinci Kat, Boston, MA 02110-1301, ABD. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + + License + Lisans + + + + AutoRunDialog + + + Removable medium is inserted + Harici bir bellek takıldı + + + + <b>Removable medium is inserted</b> + <b>Harici Bellek Takıldı</b> + + + + Type of medium: + Bellek tipi: + + + + Detecting... + Taranıyor... + + + + Please select the action you want to perform: + Gerçekleştireceğiniz eylemi seçiniz: + + + + DesktopFolder + + + Form + Form + + + + Desktop + Masaüstü + + + + Desktop folder: + Masaüstü: + + + + Image file + Görsel dosyası + + + + Folder path + Dosya yolu + + + + &Browse + &Gözat + + + + DesktopPreferencesDialog + + + Desktop Preferences + Masaüstü Seçenekleri + + + + Background + Arkaplan + + + + Wallpaper mode: + Duvarkağıdı yerleşim biçimi: + + + + Wallpaper image file: + Duvarkağıdı: + + + + Select background color: + Duvarkağıdı olarak arkaplan rengi seç: + + + + Image file + Görsel dosyası + + + + Image file path + Görsel dosyası yolu + + + + &Browse + &Gözat + + + + Label Text + Metin Etiketi + + + + Select text color: + Metin için renk seç: + + + + Select shadow color: + Metin gölgesi için renk seç: + + + + Select font: + Font biçimini seç: + + + + General + Genel + + + + Window Manager + Pencere Yönetici + + + + Show menus provided by window managers when desktop is clicked + Masaüstüne sağ tıklandığında Lxqt Uygulama Menüsünü göster + + + + Advanced + Gelişmiş + + + + MainWindow + + + File Manager + Dosya Yönetici + + + + Go &Up + Üst &Dizin + + + + Go Up + Üst Dizin + + + + Alt+Up + Alt+Yukarı + + + + &Home + &Ev Dizini + + + + Alt+Home + Alt+Home + + + + &Reload + &Yeniden Yükle + + + + F5 + F5 + + + + Go + Git + + + + Quit + Çıkış + + + + &About + &Hakkında + + + + &New Window + &Yeni Pencere + + + + New Window + Yeni Pencere + + + + Ctrl+N + Ctrl+N + + + + Show &Hidden + Göster &Gizle + + + + Ctrl+H + Ctrl+H + + + + &Computer + &Bilgisayar + + + + &Trash + &Çöp + + + + &Network + &Ağ + + + + &Desktop + &Masaüstü + + + + &Add to Bookmarks + &Yer İmlerine Ekle + + + + &Applications + &Uygulamalar + + + + Reload + Yeniden Yükle + + + + &Icon View + &Simgeler + + + + &Compact View + &Kompakt Görünüm + + + + &Detailed List + &Detaylı Liste + + + + &Thumbnail View + &Önizleme + + + + Cu&t + Ke&s + + + + Ctrl+X + Ctrl+X + + + + &Copy + &Kopyala + + + + Ctrl+C + Ctrl+C + + + + &Paste + &Yapıştır + + + + Ctrl+V + Ctrl+V + + + + Select &All + Tümünü &Seç + + + + Ctrl+A + Ctrl+A + + + + Pr&eferences + Ter&cihler + + + + &Ascending + &Artan + + + + &Descending + &Azalan + + + + &By File Name + &Dosya Adı + + + + By &Modification Time + &Değiştirme Zamanı + + + + By File &Type + &Dosya Tipi + + + + By &Owner + &Sahiplik + + + + &Folder First + &Önce Klasörler + + + + &Case Sensitive + &Alfabetik + + + + By File &Size + Dosya &Boyutu + + + + &Close Window + &Pencereyi Kapat + + + + &Folder + &Klasör + + + + &Blank File + &Boş Dosya + + + + New &Tab + Yeni &Sekme + + + + New Tab + Yeni Sekme + + + + Ctrl+T + Ctrl+T + + + + Go &Back + Geri &Git + + + + Go Back + Geri Git + + + + Alt+Left + Alt+Left + + + + Go &Forward + &İleri + + + + Go Forward + İleri + + + + Alt+Right + Alt+Right + + + + &Invert Selection + &Tersini Seç + + + + &Delete + &Sil + + + + Del + Sil + + + + &Rename + &Adını değiştir + + + + F2 + F2 + + + + C&lose Tab + S&ekmeyi Kapat + + + + Ctrl+W + Ctrl+W + + + + File &Properties + Dosya &Özellikleri + + + + Alt+Return + Alt+Enter + + + + &Folder Properties + &Klasör Özellikleri + + + + Edit Bookmarks + Yer İmlerini Düzenle + + + + Open &Terminal + Uçbirim &Aç + + + + F4 + F4 + + + + Open as &Root + &Yetkili Olarak PCManFM Aç + + + + &Edit Bookmarks + &Yer İmlerini Düzenle + + + + Ctrl+Shift+N + Ctrl+Shift+N + + + + Ctrl+Alt+N + Ctrl+Alt+N + + + + &Find Files + Dosya &Bul + + + + F3 + F3 + + + + Filter + Filtre + + + + Filter by string... + Satırları filtrele... + + + + &File + &Dosya + + + + C&reate New + Y&eni Oluştur + + + + &Help + &Yardım + + + + &View + &Görünüm + + + + &Sorting + &Sıralama + + + + &Edit + &Düzenle + + + + &Bookmarks + &Yer imleri + + + + &Go + &Git + + + + &Tool + &Araçlar + + + + Main Toolbar + Araç Çubuğu + + + + PCManFM::Application + + + Name of configuration profile + Profil yapılandırma adı + + + + PROFILE + PROFİL + + + + Run PCManFM as a daemon + Daemon olarak PCManFM çalıştırın + + + + Quit PCManFM + PCManFM den Çık + + + + Launch desktop manager + Masaüstü yöneticiyi başlat + + + + Turn off desktop manager if it's running + Eğer masaüstü yönetici çalışıyorsa kapat + + + + Open desktop preference dialog on the page with the specified name + Aynı adı taşıyan sayfa yada dosya varsa masaüstünde bir tercih öner + + + + + NAME + İSİM + + + + Open new window + Yeni pencere aç + + + + Open Find Files utility + Açık Dosya Bulmaya yarar + + + + Set desktop wallpaper from image FILE + DOSYA masaüstü duvarkağıdı olarak ayarlansın + + + + FILE + DOSYA + + + + Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile) + Masaüstü duvarkağıdı ayarı. MOD=(color|stretch|fit|center|tile) + + + + MODE + MOD + + + + Open Preferences dialog on the page with the specified name + Aynı adı taşıyan sayfa yada dosya varsa bir tercih öner + + + + Files or directories to open + Dosya veya dizin aç + + + + [FILE1, FILE2,...] + [DOSYA1, DOSYA,...] + + + + + Error + Hata + + + + Terminal emulator is not set. + Uçbirim uygulaması ayarlanmadı. + + + + PCManFM::AutoRunDialog + + + Open in file manager + Dosya yöneticisinde aç + + + + Removable Disk + Çıkarılabilir Bellek + + + + PCManFM::DesktopPreferencesDialog + + + Fill with background color only + Arkaplan sadece renk dolgusu olsun + + + + Stretch to fill the entire screen + Tüm ekranı kaplayacak şekilde uzat + + + + Stretch to fit the screen + Ekran boyutuna uzat ve uydur + + + + Center on the screen + Ekranı ortala + + + + Tile the image to fill the entire screen + Tüm ekranı dolduracak şekilde döşe + + + + Image Files + Görsel Dosyası + + + + PCManFM::DesktopWindow + + + Stic&k to Current Position + Geçerli Konuma Sa&bitle + + + + Desktop Preferences + Masaüstü Tercihleri + + + + PCManFM::MainWindow + + + Clear text (Ctrl+K) + Metni temizle (Ctrl+K) + + + + Version: %1 + Sürüm: %1 + + + + &Move to Trash + &Çöpe Taşı + + + + &Delete + &Sil + + + + + Error + Hata + + + + Switch user command is not set. + Kullanıcı değişitirme-komutu ayarlı değil. + + + + PCManFM::PreferencesDialog + + + Icon View + Simgeler + + + + Compact Icon View + Kompakt Simgeler + + + + Thumbnail View + Önizleme + + + + Detailed List View + Detaylı Liste + + + + PCManFM::TabPage + + + Error + Hata + + + + Free space: %1 (Total: %2) + Boş alan: %1 (Toplam %2) + + + + %n item(s) + + %n nesne(ler) + + + + + (%n hidden) + + (%n gizli) + + + + + %1 item(s) selected + %1 nesne(ler) seçildi + + + + PCManFM::View + + + Open in New T&ab + Yeni S&ekmede Aç + + + + Open in New Win&dow + Yeni Pen&cerede Aç + + + + Open in Termina&l + Uçbirim&de Aç + + + + PreferencesDialog + + + Preferences + Tercihler + + + + User Interface + Kullanıcı Arayüzü + + + + Behavior + Davranış + + + + + Thumbnail + Önizleme + + + + Volume + Disk Yönetimi + + + + Advanced + Gelişmiş + + + + Icons + Simgeler + + + + Size of big icons: + Büyük simge boyutu: + + + + Size of small icons: + Küçük simge boyutu: + + + + Size of thumbnails: + Önizleme boyutu: + + + + Size of side pane icons: + Yan bölme simgelerinin boyutu: + + + + Icon theme: + Simge teması: + + + + Window + Pencere + + + + Always show the tab bar + Daima sekme çubuğunu göster + + + + Show 'Close' buttons on tabs + Sekmelerde 'Kapat' düğmesi göster + + + + Remember the size of the last closed window + Son kapatılan pencere boyutunu anımsa + + + + Default width of new windows: + Yeni pencereleri varsayılan genişlikte aç: + + + + Default height of new windows: + Yeni pencereleri varsayılan yükseklikte aç: + + + + Browsing + Gözat + + + + Open files with single click + Dosyaları çift tıklama ile aç + + + + Delay of auto-selection in single click mode (0 to disable) + İmleç üzerinde bekleyince kendiliğinden seç ve tek tıkla (0 etkisizleştirir) + + + + Default view mode: + Varsayılan görünüm modu: + + + + sec + .san + + + + File Operations + Dosya İşlemleri + + + + Confirm before deleting files + Dosyaları silmeden önce onayla + + + + Move deleted files to "trash bin" instead of erasing from disk. + Silinen dosyaları "çöpe atmadan" diskten sil. + + + + Show thumbnails of files + Dosya önizlemelerini göster + + + + Only show thumbnails for local files + Yerel dosyalar için önizleme göster + + + + Display + Görünüm + + + + Bookmarks: + Yerimleri: + + + + Open in current tab + Geçerli sekmede aç + + + + Open in new tab + Yeni sekmede aç + + + + Open in new window + Yeni pencerede aç + + + + Erase files on removable media instead of "trash can" creation + Çıkarılabilir bellek takılınca kendiliğinden oluşan "kalıntıları" sil + + + + Confirm before moving files into "trash can" + Dosyalar "çöpe" gönderilmeden önce onay iste + + + + Don't ask options on launch executable file + Çalıştırılabilir dosya seçeneklerini sorma + + + + User interface + Kullanıcı arayüzü + + + + Treat backup files as hidden + Yedekleme dosyalarını gizle + + + + Always show full file names + Her zaman dosya adının tamamını göster + + + + Show icons of hidden files shadowed + Gizli dosyaların simgesini gölgele + + + + Show in places + Alan göster + + + + Home + Ev Dizini + + + + Desktop + Masaüstü + + + + Trash can + Çöp Kutusu + + + + Computer + Bilgisayar + + + + Applications + Uygualamalar + + + + Devices + Aygıtlar + + + + Network + Ağ + + + + Do not generate thumbnails for image files exceeding this size: + Şundan büyük boyuttaki dosyalar için önizleme oluşturma: + + + + KB + .KB + + + + Auto Mount + Otomatik bağla + + + + Mount mountable volumes automatically on program startup + Uygulama başlarken diskleri otomatik bağla + + + + Mount removable media automatically when they are inserted + Çıkarılabilir bellek takıldığında otomatik olarak bağla + + + + Show available options for removable media when they are inserted + Çıkarılabilir bellek takıldığında seçenekleri göster + + + + When removable medium unmounted: + Çıkarılabilir disk ayrıldığında: + + + + Close &tab containing removable medium + Bellek çıkarılınca &sekme kapansın + + + + Chan&ge folder in the tab to home folder + Sek&me konumu kullanıcı klasörü olarak değişsin + + + + Programs + Uygulamalar + + + + Terminal emulator: + Uçbirim emülatörü: + + + + Switch &user command: + &Kullanıcı değiştirme-komutu: + + + + Examples: "xterm -e %s" for terminal or "gksu %s" for switching user. +%s = the command line you want to execute with terminal or su. + Örnek: uçbirim için "xterm -e %s" veya kullanıcı değiştirmek için "gksu %s". +%s = komut satırı veya uçbirimde su komutu ile. + + + + Archiver in&tegration: + Sıkıştırma uy&gulaması: + + + + Templates + Şablonlar + + + + Show only user defined templates in menu + Menüde sadece kullanıcı şablonlarını göster + + + + Show only one template for each MIME type + Her MIME türü için tek bir şablon göster + + + + Run default application after creation from template + Şablonu uygulama çalıştıktan sonra oluştur + + + + Use SI decimal prefixes instead of IEC binary prefixes + SI onluk önekleri yerine IEC ikili önekleri kullan + + + diff --git a/pcmanfm/view.cpp b/pcmanfm/view.cpp index 5113338..e941b92 100644 --- 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(); diff --git a/pcmanfm/view.h b/pcmanfm/view.h index e7e920a..f3b1128 100644 --- 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);