mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	minor tweak...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									f8dfa167c9
								
							
						
					
					
						commit
						71c4259746
					
				| @ -215,7 +215,13 @@ var ElectronHostActions = actions.Actions({ | |||||||
| 
 | 
 | ||||||
| 	showDevTools: ['Interface|Development/Show Dev Tools', | 	showDevTools: ['Interface|Development/Show Dev Tools', | ||||||
| 		function(){ | 		function(){ | ||||||
| 			electron.remote.getCurrentWindow().openDevTools() }], | 			var w = electron.remote.getCurrentWindow() | ||||||
|  | 				 | ||||||
|  | 			w.openDevTools()  | ||||||
|  | 			// focus the devtools if its window is available...
 | ||||||
|  | 			w.devToolsWebContents | ||||||
|  | 				&& w.devToolsWebContents.focus() | ||||||
|  | 		}], | ||||||
| 	// XXX make this portable (osx, linux)...
 | 	// XXX make this portable (osx, linux)...
 | ||||||
| 	showInFolder: ['File|Image/Show in $folder', | 	showInFolder: ['File|Image/Show in $folder', | ||||||
| 		function(image){ | 		function(image){ | ||||||
|  | |||||||
| @ -1634,15 +1634,25 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 		'export-path': null, | 		'export-path': null, | ||||||
| 		'export-paths': [], | 		'export-paths': [], | ||||||
| 
 | 
 | ||||||
| 		'export-preview-name-pattern': '%f', | 		// NOTE: file extension is added automatically...
 | ||||||
|  | 		// NOTE: see .formatImageName(..) for format docs...
 | ||||||
|  | 		'export-preview-name-pattern': '%n%(-%c)c', | ||||||
| 		'export-preview-name-patterns': [ | 		'export-preview-name-patterns': [ | ||||||
| 			'%i-%f', | 			'%n%(-bookmarked)b%(-%c)c', | ||||||
| 			'%g-%f', | 			'%n%(-bookmarked)b%(-m)m%(-%c)c', | ||||||
| 			'%n%(-bookmarked)b%(-m)m%(-%c)c%e', | 			'%n%(-%c)c', | ||||||
| 			'%n%(-bookmarked)b%(-%c)c%e', | 			'%i-%n', | ||||||
| 			'%f', | 			'%g-%n', | ||||||
| 		], | 		], | ||||||
| 
 | 
 | ||||||
|  | 		// NOTE: this is applied ONLY if there is a naming conflict...
 | ||||||
|  | 		// NOTE: see .formatImageName(..) for format docs...
 | ||||||
|  | 		// XXX adding a %c is more human-readable but is unstable as
 | ||||||
|  | 		// 		depends on gid order, %g resolves this problem but is 
 | ||||||
|  | 		// 		not very intuitive...
 | ||||||
|  | 		//'export-conflicting-image-name': '%n%(-%g)c',
 | ||||||
|  | 		'export-conflicting-image-name': '%n%(-%c)c', | ||||||
|  | 
 | ||||||
| 		'export-level-directory-name': 'fav', | 		'export-level-directory-name': 'fav', | ||||||
| 		'export-level-directory-names': [ | 		'export-level-directory-names': [ | ||||||
| 			'fav', | 			'fav', | ||||||
| @ -1671,13 +1681,6 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 			'1920', | 			'1920', | ||||||
| 		], | 		], | ||||||
| 		'export-preview-size-limit': 'no limit', | 		'export-preview-size-limit': 'no limit', | ||||||
| 
 |  | ||||||
| 		// NOTE: this is applied ONLY if there is a naming conflict...
 |  | ||||||
| 		// XXX adding a %c is more human-readable but is unstable as
 |  | ||||||
| 		// 		depends on gid order, %g resolves this problem but is 
 |  | ||||||
| 		// 		not very intuitive...
 |  | ||||||
| 		//'export-conflicting-image-name': '%n%(-%g)c%e',
 |  | ||||||
| 		'export-conflicting-image-name': '%n%(-%c)c%e', |  | ||||||
| 	}, | 	}, | ||||||
| 
 | 
 | ||||||
| 	// Save index...
 | 	// Save index...
 | ||||||
| @ -1983,16 +1986,14 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 			return Promise.all(queue) | 			return Promise.all(queue) | ||||||
| 		}], | 		}], | ||||||
| 
 | 
 | ||||||
|  | 	// XXX document data format...
 | ||||||
| 	// XXX should %T / %I be global or current crop???
 | 	// XXX should %T / %I be global or current crop???
 | ||||||
| 	// XXX set length of %g in options...
 | 	// XXX set length of %g in options...
 | ||||||
| 	formatImageName: ['- File/', | 	formatImageName: ['- File/', | ||||||
| 		core.doc` | 		core.doc` | ||||||
| 
 | 
 | ||||||
| 		Filename patterns: | 		Filename patterns: | ||||||
| 		 	%f		- full file name (same as: %n%e) |  | ||||||
| 
 |  | ||||||
| 		 	%n		- name without extension | 		 	%n		- name without extension | ||||||
| 		 	%e		- extension with leading dot |  | ||||||
| 		 | 		 | ||||||
| 		 	%gid	- full image gid | 		 	%gid	- full image gid | ||||||
| 		 	%g		- short gid | 		 	%g		- short gid | ||||||
| @ -2015,6 +2016,7 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 						NOTE: this is not stable and can change depending | 						NOTE: this is not stable and can change depending | ||||||
| 							on image order. | 							on image order. | ||||||
| 
 | 
 | ||||||
|  | 		NOTE: file extension is added automatically. | ||||||
| 		NOTE: all group patterns (i.e. '%(..)x') can include other patterns. | 		NOTE: all group patterns (i.e. '%(..)x') can include other patterns. | ||||||
| 		`,
 | 		`,
 | ||||||
| 		function(pattern, name, data){ | 		function(pattern, name, data){ | ||||||
| @ -2031,6 +2033,7 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 			var img = this.images[gid] | 			var img = this.images[gid] | ||||||
| 			name = name || pathlib.basename(img.path || (img.name + img.ext)) | 			name = name || pathlib.basename(img.path || (img.name + img.ext)) | ||||||
| 			var ext = pathlib.extname(name) | 			var ext = pathlib.extname(name) | ||||||
|  | 			var to_ext = data.ext || ext | ||||||
| 
 | 
 | ||||||
| 			var tags = data.tags || this.data.getTags(gid) | 			var tags = data.tags || this.data.getTags(gid) | ||||||
| 
 | 
 | ||||||
| @ -2051,9 +2054,7 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 
 | 
 | ||||||
| 			return pattern | 			return pattern | ||||||
| 				// file name...
 | 				// file name...
 | ||||||
| 				.replace(/%f/, name) |  | ||||||
| 				.replace(/%n/, name.replace(ext, '')) | 				.replace(/%n/, name.replace(ext, '')) | ||||||
| 				.replace(/%e/, ext) |  | ||||||
| 
 | 
 | ||||||
| 				// gid...
 | 				// gid...
 | ||||||
| 				.replace(/%gid/, gid) | 				.replace(/%gid/, gid) | ||||||
| @ -2091,6 +2092,8 @@ var FileSystemWriterActions = actions.Actions({ | |||||||
| 					/%\(([^)]*)\)C/, conflicts ? '$1' : '') | 					/%\(([^)]*)\)C/, conflicts ? '$1' : '') | ||||||
| 				.replace( | 				.replace( | ||||||
| 					/%\(([^)]*)\)c/, (conflicts || {})[gid] ? '$1' : '') | 					/%\(([^)]*)\)c/, (conflicts || {})[gid] ? '$1' : '') | ||||||
|  | 
 | ||||||
|  | 				+ to_ext | ||||||
| 		}], | 		}], | ||||||
| 	 | 	 | ||||||
| 	// XXX might also be good to save/load the export options to .ImageGrid-export.json
 | 	// XXX might also be good to save/load the export options to .ImageGrid-export.json
 | ||||||
| @ -2392,7 +2395,7 @@ var FileSystemWriterUIActions = actions.Actions({ | |||||||
| 				}) | 				}) | ||||||
| 			} | 			} | ||||||
| 
 | 
 | ||||||
| 			// make this a dialog...
 | 			// XXX make this a dialog...
 | ||||||
| 			var res = make(['Filename $pattern: ', pattern], { | 			var res = make(['Filename $pattern: ', pattern], { | ||||||
| 				open: widgets.makeNestedConfigListEditor(actions, parent, | 				open: widgets.makeNestedConfigListEditor(actions, parent, | ||||||
| 					'export-preview-name-patterns', | 					'export-preview-name-patterns', | ||||||
| @ -2407,7 +2410,6 @@ var FileSystemWriterUIActions = actions.Actions({ | |||||||
| 					}, function(){ | 					}, function(){ | ||||||
| 						this.showExaples = function(){ showExaples(this.selected) } | 						this.showExaples = function(){ showExaples(this.selected) } | ||||||
| 						this.keyboard.handler('General', 'i', 'showExaples') | 						this.keyboard.handler('General', 'i', 'showExaples') | ||||||
| 
 |  | ||||||
| 						this.showDoc = function(){ actions.showDoc('formatImageName') } | 						this.showDoc = function(){ actions.showDoc('formatImageName') } | ||||||
| 						this.keyboard.handler('General', '?', 'showDoc') | 						this.keyboard.handler('General', '?', 'showDoc') | ||||||
| 					}), | 					}), | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user